[Refactor] (All): Restructure include system.

2026-09-10 05:08:31 +09:00 · 2025-08-09 23:10:34 +08:00
parent a8914c09ce
commit 93ca669929
75 changed files with 3605 additions and 3339 deletions
@@ -1,79 +1,84 @@
-#include "../../../Includes.h"
+#include "Validators.h"
+#include <MG_State/GLState/Core.h>
+#include <MG_State/GLState/ErrorState/Error.h>
+#include <MG_Util/Converters/GLToStr/GLEnumConverter.h>
+#include <MG_Util/Converters/MGToGL/BufferEnumConverter.h>
+#include <MG_Util/Converters/MGToStr/BufferEnumConverter.h>

 namespace MobileGL::MG_Impl::GLImpl {
-	namespace BufferImpl {
-		bool ValidateBufferTarget(BufferTarget target) {
-			if (target == BufferTarget::Unknown) {
-				using namespace MG_Util;
-				String bufferTargetStr = ConvertBufferTargetToString(target);
-				String glTargetStr = ConvertGLEnumToString(ConvertBufferTargetToGLEnum(target));
-				MG_State::pGLContext->RecordError(ErrorCode::InvalidEnum,
-					MakeShared<GenericErrorInfo>("MG_Impl/GLImpl/BufferImpl", "ValidateBufferTarget",
-						std::format("Target {} ({}) is not valid.",
-							bufferTargetStr, glTargetStr)));
-				return false;
-			}
-			
-			if (target == BufferTarget::Index && MG_State::pGLContext->GetBoundVertexArray() == nullptr) {
-				MG_State::pGLContext->RecordError(ErrorCode::InvalidOperation,
-					MakeShared<GenericErrorInfo>("MG_Impl/GLImpl/BufferImpl", "ValidateBufferTarget",
-						"No vertex array object is bound."));
-				return false;
-			}
+    namespace BufferImpl {
+        bool ValidateBufferTarget(BufferTarget target) {
+            if (target == BufferTarget::Unknown) {
+                using namespace MG_Util;
+                String bufferTargetStr = ConvertBufferTargetToString(target);
+                String glTargetStr = ConvertGLEnumToString(ConvertBufferTargetToGLEnum(target));
+                MG_State::pGLContext->RecordError(
+                    ErrorCode::InvalidEnum,
+                    MakeShared<GenericErrorInfo>(
+                        "MG_Impl/GLImpl/BufferImpl", "ValidateBufferTarget",
+                        std::format("Target {} ({}) is not valid.", bufferTargetStr, glTargetStr)));
+                return false;
+            }

-			return true;
-		}
+            if (target == BufferTarget::Index && MG_State::pGLContext->GetBoundVertexArray() == nullptr) {
+                MG_State::pGLContext->RecordError(ErrorCode::InvalidOperation,
+                                                  MakeShared<GenericErrorInfo>("MG_Impl/GLImpl/BufferImpl",
+                                                                               "ValidateBufferTarget",
+                                                                               "No vertex array object is bound."));
+                return false;
+            }

-		bool ValidateBufferName(Uint index) {
-			bool isValid = MG_State::pGLContext->ValidateBufferName(index);
-			if (isValid)
-				return true;
-			MG_State::pGLContext->RecordError(ErrorCode::InvalidOperation,
-				MakeShared<GenericErrorInfo>("MG_Impl/GLImpl/BufferImpl", "ValidateBufferName",
-					std::format("Buffer name {} is not valid.", index)));
-			return false;
-		}
+            return true;
+        }

-		bool ValidateBufferUsage(BufferUsage usage) {
-			if (usage != BufferUsage::Unknown) {
-				return true;
-			}
-			using namespace MG_Util;
-			String bufferUsageStr = ConvertBufferUsageToString(usage);
-			String glUsageStr = ConvertGLEnumToString(ConvertBufferUsageToGLEnum(usage));
-			MG_State::pGLContext->RecordError(ErrorCode::InvalidEnum,
-				MakeShared<GenericErrorInfo>("MG_Impl/GLImpl/BufferImpl", "ValidateBufferUsage",
-					std::format("Usage {} ({}) is not one of the allowable values.", 
-						bufferUsageStr, glUsageStr)));
-			return false;
-		}
+        bool ValidateBufferName(Uint index) {
+            bool isValid = MG_State::pGLContext->ValidateBufferName(index);
+            if (isValid) return true;
+            MG_State::pGLContext->RecordError(
+                ErrorCode::InvalidOperation,
+                MakeShared<GenericErrorInfo>("MG_Impl/GLImpl/BufferImpl", "ValidateBufferName",
+                                             std::format("Buffer name {} is not valid.", index)));
+            return false;
+        }

-		bool ValidateBufferMappingAccess(Flags<BufferMappingAccessBit> accessBits) {
-			if (accessBits == BufferMappingAccessBit::Null) {
-				MG_State::pGLContext->RecordError(ErrorCode::InvalidEnum,
-					MakeShared<GenericErrorInfo>("MG_Impl/GLImpl/BufferImpl", "ValidateBufferMappingAccess",
-						"Access bits cannot be null."));
-				return false;
-			}
+        bool ValidateBufferUsage(BufferUsage usage) {
+            if (usage != BufferUsage::Unknown) {
+                return true;
+            }
+            using namespace MG_Util;
+            String bufferUsageStr = ConvertBufferUsageToString(usage);
+            String glUsageStr = ConvertGLEnumToString(ConvertBufferUsageToGLEnum(usage));
+            MG_State::pGLContext->RecordError(
+                ErrorCode::InvalidEnum,
+                MakeShared<GenericErrorInfo>(
+                    "MG_Impl/GLImpl/BufferImpl", "ValidateBufferUsage",
+                    std::format("Usage {} ({}) is not one of the allowable values.", bufferUsageStr, glUsageStr)));
+            return false;
+        }

-			const auto validBits =
-				BufferMappingAccessBit::Read | 
-				BufferMappingAccessBit::Write | 
-				BufferMappingAccessBit::InvalidateRange | 
-				BufferMappingAccessBit::InvalidateBuffer | 
-				BufferMappingAccessBit::FlushExplicit | 
-				BufferMappingAccessBit::Unsynchronized | 
-				BufferMappingAccessBit::Persistent | 
-				BufferMappingAccessBit::Coherent;
+        bool ValidateBufferMappingAccess(Flags<BufferMappingAccessBit> accessBits) {
+            if (accessBits == BufferMappingAccessBit::Null) {
+                MG_State::pGLContext->RecordError(ErrorCode::InvalidEnum,
+                                                  MakeShared<GenericErrorInfo>("MG_Impl/GLImpl/BufferImpl",
+                                                                               "ValidateBufferMappingAccess",
+                                                                               "Access bits cannot be null."));
+                return false;
+            }

-			if ((accessBits & validBits) != accessBits) {
-				MG_State::pGLContext->RecordError(ErrorCode::InvalidEnum,
-					MakeShared<GenericErrorInfo>("MG_Impl/GLImpl/BufferImpl", "ValidateBufferMappingAccess",
-						"Access bits cannot contain invalid flags."));
-				return false;
-			}
+            const auto validBits = BufferMappingAccessBit::Read | BufferMappingAccessBit::Write |
+                                   BufferMappingAccessBit::InvalidateRange | BufferMappingAccessBit::InvalidateBuffer |
+                                   BufferMappingAccessBit::FlushExplicit | BufferMappingAccessBit::Unsynchronized |
+                                   BufferMappingAccessBit::Persistent | BufferMappingAccessBit::Coherent;

-			return true;
-		}
-	}
-}
+            if ((accessBits & validBits) != accessBits) {
+                MG_State::pGLContext->RecordError(
+                    ErrorCode::InvalidEnum,
+                    MakeShared<GenericErrorInfo>("MG_Impl/GLImpl/BufferImpl", "ValidateBufferMappingAccess",
+                                                 "Access bits cannot contain invalid flags."));
+                return false;
+            }
+
+            return true;
+        }
+    } // namespace BufferImpl
+} // namespace MobileGL::MG_Impl::GLImpl