From 8086fb76f17dab31a6c25577bc54ff5bddd88258 Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Tue, 16 May 2023 02:23:45 +0800
Subject: [PATCH] fixed a few compile error.

---
 inc/hgl/graph/VKRenderResource.h                        | 4 ++--
 inc/hgl/graph/mtl/2d/VertexColor2D.h                    | 3 +--
 inc/hgl/graph/mtl/MaterialConfig.h                      | 3 +++
 {src/ShaderGen/common => inc/hgl/graph/mtl}/UBOCommon.h | 0
 src/SceneGraph/Vulkan/VKRenderResource.cpp              | 2 +-
 src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp      | 2 +-
 src/ShaderGen/2d/VertexColor2D.cpp                      | 2 +-
 src/ShaderGen/CMakeLists.txt                            | 8 ++++----
 8 files changed, 13 insertions(+), 11 deletions(-)
 rename {src/ShaderGen/common => inc/hgl/graph/mtl}/UBOCommon.h (100%)

diff --git a/inc/hgl/graph/VKRenderResource.h b/inc/hgl/graph/VKRenderResource.h
index 322b1d4f..bca82ab3 100644
--- a/inc/hgl/graph/VKRenderResource.h
+++ b/inc/hgl/graph/VKRenderResource.h
@@ -98,11 +98,11 @@ public: //Material
     const ShaderModule *CreateShaderModule(const OSString &filename,VkShaderStageFlagBits shader_stage,const uint32_t *spv_data,const size_t spv_size);
     
     Material *          CreateMaterial(const OSString &);
-    Material *          CreateMaterial(const MaterialCreateInfo *);
+    Material *          CreateMaterial(const mtl::MaterialCreateInfo *);
 
     MaterialInstance *  CreateMaterialInstance(Material *,const VILConfig *vil_cfg=nullptr);
     MaterialInstance *  CreateMaterialInstance(const OSString &,const VILConfig *vil_cfg=nullptr);
-    MaterialInstance *  CreateMaterialInstance(const MaterialCreateInfo *,const VILConfig *vil_cfg=nullptr);
+    MaterialInstance *  CreateMaterialInstance(const mtl::MaterialCreateInfo *,const VILConfig *vil_cfg=nullptr);
 
     Primitive *         CreatePrimitive(const uint32_t vertex_count=0);
 
diff --git a/inc/hgl/graph/mtl/2d/VertexColor2D.h b/inc/hgl/graph/mtl/2d/VertexColor2D.h
index d70ce309..989ed5ed 100644
--- a/inc/hgl/graph/mtl/2d/VertexColor2D.h
+++ b/inc/hgl/graph/mtl/2d/VertexColor2D.h
@@ -1,8 +1,7 @@
 #ifndef HGL_GRAPH_MTL_2D_VERTEX2D_INCLUDE
 #define HGL_GRAPH_MTL_2D_VERTEX2D_INCLUDE
 
-#include"Std2DMaterial.h"
-#include<hgl/graph/CoordinateSystem.h>
+#include<hgl/graph/mtl/2d/Material2DConfig.h>
 
 STD_MTL_NAMESPACE_BEGIN
 MaterialCreateInfo *CreateVertexColor2D(const Material2DConfig *);
diff --git a/inc/hgl/graph/mtl/MaterialConfig.h b/inc/hgl/graph/mtl/MaterialConfig.h
index 7235c3c6..bdcb9500 100644
--- a/inc/hgl/graph/mtl/MaterialConfig.h
+++ b/inc/hgl/graph/mtl/MaterialConfig.h
@@ -7,6 +7,9 @@
 #include<hgl/graph/VK.h>
 
 STD_MTL_NAMESPACE_BEGIN
+
+class MaterialCreateInfo;
+
 /**
  * 材质配置结构
  */
diff --git a/src/ShaderGen/common/UBOCommon.h b/inc/hgl/graph/mtl/UBOCommon.h
similarity index 100%
rename from src/ShaderGen/common/UBOCommon.h
rename to inc/hgl/graph/mtl/UBOCommon.h
diff --git a/src/SceneGraph/Vulkan/VKRenderResource.cpp b/src/SceneGraph/Vulkan/VKRenderResource.cpp
index 6319d05c..9af0be56 100644
--- a/src/SceneGraph/Vulkan/VKRenderResource.cpp
+++ b/src/SceneGraph/Vulkan/VKRenderResource.cpp
@@ -72,7 +72,7 @@ MaterialInstance *RenderResource::CreateMaterialInstance(const OSString &mtl_fil
     return CreateMaterialInstance(mtl,vil_cfg);
 }
 
-MaterialInstance *RenderResource::CreateMaterialInstance(const MaterialCreateInfo *mci,const VILConfig *vil_cfg)
+MaterialInstance *RenderResource::CreateMaterialInstance(const mtl::MaterialCreateInfo *mci,const VILConfig *vil_cfg)
 {
     Material *mtl=this->CreateMaterial(mci);
 
diff --git a/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp b/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp
index 1774a4d1..be324814 100644
--- a/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp
+++ b/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp
@@ -199,7 +199,7 @@ Material *RenderResource::CreateMaterial(const OSString &filename)
     return(mtl);
 }
 
-Material *RenderResource::CreateMaterial(const MaterialCreateInfo *mci)
+Material *RenderResource::CreateMaterial(const mtl::MaterialCreateInfo *mci)
 {
     if(!mci)
         return(nullptr);
diff --git a/src/ShaderGen/2d/VertexColor2D.cpp b/src/ShaderGen/2d/VertexColor2D.cpp
index 215ec521..3c16295e 100644
--- a/src/ShaderGen/2d/VertexColor2D.cpp
+++ b/src/ShaderGen/2d/VertexColor2D.cpp
@@ -3,7 +3,7 @@
 #include<hgl/graph/VKMaterial.h>
 #include<hgl/graph/VKDevice.h>
 #include<hgl/shadergen/MaterialCreateInfo.h>
-#include"common/UBOCommon.h"
+#include<hgl/graph/mtl/UBOCommon.h>
 #include"common/MFCommon.h"
 
 STD_MTL_NAMESPACE_BEGIN
diff --git a/src/ShaderGen/CMakeLists.txt b/src/ShaderGen/CMakeLists.txt
index 0720673a..ed140d2f 100644
--- a/src/ShaderGen/CMakeLists.txt
+++ b/src/ShaderGen/CMakeLists.txt
@@ -34,16 +34,16 @@ SET(GLSL_COMPILER_SOURCE	GLSLCompiler.h
 
 SOURCE_GROUP("GLSL Compiler" FILES ${GLSL_COMPILER_SOURCE})
 
+set(STD_MTL_HEADER_PATH  ${ROOT_INCLUDE_PATH}/hgl/graph/mtl)
 
-SET(SHADERGEN_COMMON_FILES  common/UBOCommon.h
-                            common/MFCommon.h)
+SET(SHADERGEN_COMMON_FILES  ${STD_MTL_HEADER_PATH}/UBOCommon.h
+                            common/MFCommon.h
+                            common/MFGetPosition.h)
 
 SOURCE_GROUP("Common" FILES ${SHADERGEN_COMMON_FILES})
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-set(STD_MTL_HEADER_PATH  ${ROOT_INCLUDE_PATH}/hgl/graph/mtl)
-
 SET(STD_MTL_2D_HEADER_PATH ${STD_MTL_HEADER_PATH}/2d)
 
 SET(STD_MTL_2D_SOURCE_FILES	${STD_MTL_2D_HEADER_PATH}/Material2DConfig.h