diff --git a/example/common/VulkanAppFramework.h b/example/common/VulkanAppFramework.h index c90d17d5..c361cbdc 100644 --- a/example/common/VulkanAppFramework.h +++ b/example/common/VulkanAppFramework.h @@ -142,7 +142,7 @@ public: ubo_vp_info=db->CreateUBO(sizeof(ViewportInfo),&vp_info); - db->global_descriptor.AddUBO(GlobalDescriptor::ViewportInfo.name,ubo_vp_info); + db->global_descriptor.AddUBO(InlineDescriptor::ViewportInfo.name,ubo_vp_info); } return(true); diff --git a/inc/hgl/graph/mtl/StdMaterial.h b/inc/hgl/graph/mtl/StdMaterial.h index a826016e..c26f4806 100644 --- a/inc/hgl/graph/mtl/StdMaterial.h +++ b/inc/hgl/graph/mtl/StdMaterial.h @@ -12,7 +12,7 @@ enum class CoordinateSystem2D Ortho //左上角为0,0;右下角为(width-1),(height-1) }; -namespace GlobalDescriptor +namespace InlineDescriptor { struct ShaderStruct { diff --git a/inc/hgl/shadergen/MaterialCreateInfo.h b/inc/hgl/shadergen/MaterialCreateInfo.h index d46c42ff..dbd76449 100644 --- a/inc/hgl/shadergen/MaterialCreateInfo.h +++ b/inc/hgl/shadergen/MaterialCreateInfo.h @@ -53,7 +53,7 @@ public: ~MaterialCreateInfo()=default; bool AddStruct(const AnsiString &ubo_typename,const AnsiString &codes); - bool AddStruct(const GlobalDescriptor::ShaderStruct &ss) + bool AddStruct(const InlineDescriptor::ShaderStruct &ss) { return AddStruct(ss.struct_name,ss.codes); } @@ -61,7 +61,7 @@ public: bool AddUBO(const VkShaderStageFlagBits flag_bits,const DescriptorSetType set_type,const AnsiString &type_name,const AnsiString &name); bool AddSampler(const VkShaderStageFlagBits flag_bits,const DescriptorSetType set_type,const SamplerType &st,const AnsiString &name); - bool AddUBO(const VkShaderStageFlagBits flag_bits,const DescriptorSetType &set_type,const GlobalDescriptor::ShaderStruct &ss) + bool AddUBO(const VkShaderStageFlagBits flag_bits,const DescriptorSetType &set_type,const InlineDescriptor::ShaderStruct &ss) { if(!mdi.hasStruct(ss.struct_name)) mdi.AddStruct(ss.struct_name,ss.codes); diff --git a/src/ShaderGen/2d/VertexColor2D.cpp b/src/ShaderGen/2d/VertexColor2D.cpp index 8baa3921..1ace52ed 100644 --- a/src/ShaderGen/2d/VertexColor2D.cpp +++ b/src/ShaderGen/2d/VertexColor2D.cpp @@ -24,7 +24,7 @@ MaterialCreateInfo *CreateVertexColor2D(const CoordinateSystem2D &cs) { mci->AddUBO(VK_SHADER_STAGE_VERTEX_BIT, DescriptorSetType::Global, - GlobalDescriptor::ViewportInfo); + InlineDescriptor::ViewportInfo); sfGetPosition="vec4 GetPosition(){return viewport.ortho_matrix*vec4(Position,0,1);}"; }