From ec45b977d176d478ca50a880dbaecd06ac7a2a75 Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Wed, 29 Mar 2023 16:45:37 +0800 Subject: [PATCH] added DescriptorSetType values in AddUBO of MaterialCreateInfo --- inc/hgl/shadergen/MaterialCreateInfo.h | 4 ++-- src/ShaderGen/2d/VertexColor2D.cpp | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/inc/hgl/shadergen/MaterialCreateInfo.h b/inc/hgl/shadergen/MaterialCreateInfo.h index 6f6a51e4..d46c42ff 100644 --- a/inc/hgl/shadergen/MaterialCreateInfo.h +++ b/inc/hgl/shadergen/MaterialCreateInfo.h @@ -61,12 +61,12 @@ 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 GlobalDescriptor::ShaderStruct &ss) + bool AddUBO(const VkShaderStageFlagBits flag_bits,const DescriptorSetType &set_type,const GlobalDescriptor::ShaderStruct &ss) { if(!mdi.hasStruct(ss.struct_name)) mdi.AddStruct(ss.struct_name,ss.codes); - return AddUBO(flag_bits,DescriptorSetType::Global,ss.struct_name,ss.name); + return AddUBO(flag_bits,set_type,ss.struct_name,ss.name); } bool CreateShader(); diff --git a/src/ShaderGen/2d/VertexColor2D.cpp b/src/ShaderGen/2d/VertexColor2D.cpp index 41866412..8baa3921 100644 --- a/src/ShaderGen/2d/VertexColor2D.cpp +++ b/src/ShaderGen/2d/VertexColor2D.cpp @@ -22,7 +22,9 @@ MaterialCreateInfo *CreateVertexColor2D(const CoordinateSystem2D &cs) if(cs==CoordinateSystem2D::Ortho) { - mci->AddUBO(VK_SHADER_STAGE_VERTEX_BIT,GlobalDescriptor::ViewportInfo); + mci->AddUBO(VK_SHADER_STAGE_VERTEX_BIT, + DescriptorSetType::Global, + GlobalDescriptor::ViewportInfo); sfGetPosition="vec4 GetPosition(){return viewport.ortho_matrix*vec4(Position,0,1);}"; }