renamed files of shadergen

inc/hgl/shadergen/MaterialCreateInfo.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include<hgl/shadergen/MaterialDescriptorManager.h>
+#include<hgl/shadergen/MaterialDescriptorInfo.h>
 #include<hgl/shadergen/ShaderCreateInfoVertex.h>
 #include<hgl/shadergen/ShaderCreateInfoGeometry.h>
 #include<hgl/shadergen/ShaderCreateInfoFragment.h>
@@ -17,7 +17,7 @@ protected:
 
     uint32_t shader_stage;                                  ///<着色器阶段
 
-    MaterialDescriptorManager mdm;                          ///<材质描述符管理器
+    MaterialDescriptorInfo mdm;                          ///<材质描述符管理器
 
     ShaderCreateInfoMap shader_map;                            ///<着色器列表
 

inc/hgl/shadergen/MaterialDescriptorInfo.h

@@ -13,7 +13,7 @@ SHADERGEN_NAMESPACE_BEGIN
 * 材质描述符管理</p>
 * 该类使用于SHADER生成前，用于统计编号set/binding
 */
-class MaterialDescriptorManager
+class MaterialDescriptorInfo
 {
     struct ShaderDescriptorSet
     {
@@ -39,8 +39,8 @@ class MaterialDescriptorManager
 
 public:
     
-    MaterialDescriptorManager();
-    ~MaterialDescriptorManager()=default;
+    MaterialDescriptorInfo();
+    ~MaterialDescriptorInfo()=default;
 
     bool AddStruct(const AnsiString &name,const AnsiString &code)
     {

inc/hgl/shadergen/ShaderCreateInfo.h

@@ -5,8 +5,8 @@
 #include<hgl/graph/VertexAttrib.h>
 SHADERGEN_NAMESPACE_BEGIN
 
-class MaterialDescriptorManager;
-class ShaderDescriptorManager;
+class MaterialDescriptorInfo;
+class ShaderDescriptorInfo;
 
 class ShaderCreateInfo
 {
@@ -14,7 +14,7 @@ protected:
 
     VkShaderStageFlagBits shader_stage;                      ///<着色器阶段
 
-    MaterialDescriptorManager *mdm;
+    MaterialDescriptorInfo *mdm;
 
 protected:
 
@@ -42,13 +42,13 @@ protected:
 
 public:
 
-    ShaderDescriptorManager *sdm;
+    ShaderDescriptorInfo *sdm;
 
     VkShaderStageFlagBits GetShaderStage()const{return shader_stage;}
 
 public:
 
-    ShaderCreateInfo(VkShaderStageFlagBits ss,MaterialDescriptorManager *m);
+    ShaderCreateInfo(VkShaderStageFlagBits ss,MaterialDescriptorInfo *m);
     virtual ~ShaderCreateInfo();
 
     int AddOutput(const graph::VAT &type,const AnsiString &name);

inc/hgl/shadergen/ShaderCreateInfoFragment.h

@@ -14,7 +14,7 @@ class ShaderCreateInfoFragment:public ShaderCreateInfo
 
 public:
 
-    ShaderCreateInfoFragment(MaterialDescriptorManager *m):ShaderCreateInfo(VK_SHADER_STAGE_FRAGMENT_BIT,m){}
+    ShaderCreateInfoFragment(MaterialDescriptorInfo *m):ShaderCreateInfo(VK_SHADER_STAGE_FRAGMENT_BIT,m){}
     ~ShaderCreateInfoFragment()=default;
 
     void UseDefaultMain();

inc/hgl/shadergen/ShaderCreateInfoGeometry.h

@@ -7,7 +7,7 @@ class ShaderCreateInfoGeometry:public ShaderCreateInfo
 {
 public:
 
-    ShaderCreateInfoGeometry(MaterialDescriptorManager *m):ShaderCreateInfo(VK_SHADER_STAGE_GEOMETRY_BIT,m){}
+    ShaderCreateInfoGeometry(MaterialDescriptorInfo *m):ShaderCreateInfo(VK_SHADER_STAGE_GEOMETRY_BIT,m){}
     ~ShaderCreateInfoGeometry()=default;
 };
 SHADERGEN_NAMESPACE_END

inc/hgl/shadergen/ShaderCreateInfoVertex.h

@@ -9,7 +9,7 @@ class ShaderCreateInfoVertex:public ShaderCreateInfo
 
 public:
 
-    ShaderCreateInfoVertex(MaterialDescriptorManager *m):ShaderCreateInfo(VK_SHADER_STAGE_VERTEX_BIT,m){}
+    ShaderCreateInfoVertex(MaterialDescriptorInfo *m):ShaderCreateInfo(VK_SHADER_STAGE_VERTEX_BIT,m){}
     ~ShaderCreateInfoVertex()=default;
 
     int AddInput(const graph::VAT &type,const AnsiString &name);

inc/hgl/shadergen/ShaderDescriptorInfo.h

@@ -5,7 +5,7 @@
 #include<hgl/type/StringList.h>
 #include<hgl/graph/VKShaderStage.h>
 #include<hgl/graph/VKDescriptorSetType.h>
-#include<hgl/shadergen/MaterialDescriptorManager.h>
+#include<hgl/shadergen/MaterialDescriptorInfo.h>
 
 SHADERGEN_NAMESPACE_BEGIN
 
@@ -17,7 +17,7 @@ using SubpassInputDescriptorList=ObjectList<SubpassInputDescriptor>;
 /**
 * Shader数据管理器,用于生成正式Shader前的资源统计
 */
-class ShaderDescriptorManager
+class ShaderDescriptorInfo
 {
     VkShaderStageFlagBits shader_stage;
 
@@ -25,7 +25,7 @@ class ShaderDescriptorManager
 
     AnsiStringList                      struct_list;        //用到的结构列表
 
-    //ubo/object在这里以及MaterialDescriptorManager中均有一份，mdm中的用于产生set/binding号，这里的用于产生shader
+    //ubo/object在这里以及MaterialDescriptorInfo中均有一份，mdm中的用于产生set/binding号，这里的用于产生shader
     UBODescriptorList                   ubo_list;
     SamplerDescriptorList               sampler_list;
     
@@ -36,8 +36,8 @@ class ShaderDescriptorManager
 
 public:
 
-    ShaderDescriptorManager(VkShaderStageFlagBits);
-    ~ShaderDescriptorManager()=default;
+    ShaderDescriptorInfo(VkShaderStageFlagBits);
+    ~ShaderDescriptorInfo()=default;
 
     const VkShaderStageFlagBits GetStageBits()const { return shader_stage; }
     const AnsiString            GetStageName()const { return AnsiString(GetShaderStageName(shader_stage)); }
@@ -71,5 +71,5 @@ public:
 #ifdef _DEBUG
     void DebugOutput(int);
 #endif//_DEBUG
-};//class ShaderDescriptorManager
+};//class ShaderDescriptorInfo
 SHADERGEN_NAMESPACE_END

inc/hgl/shadergen/StandardMaterial.h

@@ -1,4 +1,4 @@
-#include<hgl/shadergen/ShaderDescriptorManager.h>
+#include<hgl/shadergen/ShaderDescriptorInfo.h>
 #include<hgl/CompOperator.h>
 
 SHADERGEN_NAMESPACE_BEGIN
@@ -106,5 +106,6 @@ class MaterialCreateInfo;
 
 Material *CreateMaterial()
 {
+    return nullptr;
 }
 SHADERGEN_NAMESPACE_END