hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added DescriptorSetType values in AddUBO of MaterialCreateInfo

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy) 2023-03-29 16:45:37 +08:00
parent 38f9a2896f
commit ec45b977d1
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/hgl/shadergen/MaterialCreateInfo.h
View File

@ -61,12 +61,12 @@ public:
bool AddUBO(const VkShaderStageFlagBits flag_bits,const DescriptorSetType set_type,const AnsiString &type_name,const AnsiString &name); 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 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)) if(!mdi.hasStruct(ss.struct_name))
mdi.AddStruct(ss.struct_name,ss.codes); 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(); bool CreateShader();

4
src/ShaderGen/2d/VertexColor2D.cpp
View File

@ -22,7 +22,9 @@ MaterialCreateInfo *CreateVertexColor2D(const CoordinateSystem2D &cs)
if(cs==CoordinateSystem2D::Ortho) 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);}"; sfGetPosition="vec4 GetPosition(){return viewport.ortho_matrix*vec4(Position,0,1);}";
} }