updated shadergen

This commit is contained in:
2023-03-14 22:22:35 +08:00
parent 2cc0dca050
commit f79599b1d4
9 changed files with 48 additions and 39 deletions

View File

@@ -50,6 +50,6 @@ 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 CompileShader();
bool CreateShader();
};//class MaterialCreater
SHADERGEN_NAMESPACE_END

View File

@@ -44,9 +44,6 @@ public:
bool AddStruct(const AnsiString &name,const AnsiString &code)
{
if(struct_map.KeyExist(name))
return(false);
struct_map.Add(name,code);
return(true);
}

View File

@@ -62,6 +62,8 @@ public:
bool CreateShader(ShaderCreater *);
const AnsiString &GetShaderSource()const{return final_shader;}
bool CompileToSPV();
};//class ShaderCreater
SHADERGEN_NAMESPACE_END

View File

@@ -20,7 +20,7 @@ class ShaderDescriptorManager
VkShaderStageFlagBits shader_stage;
ShaderStageIO stage_io;
AnsiStringList struct_list; //用到的结构列表
//ubo/object在这里以及MaterialDescriptorManager中均有一份mdm中的用于产生set/binding号这里的用于产生shader
@@ -39,7 +39,7 @@ public:
const VkShaderStageFlagBits GetStageBits()const { return shader_stage; }
const AnsiString GetStageName()const { return AnsiString(GetShaderStageName(shader_stage)); }
public:
const ShaderStageIO & GetShaderStageIO()const{return stage_io;}
@@ -51,8 +51,8 @@ public:
const ObjectList<ConstValueDescriptor> & GetConstList()const{return const_value_list;}
const ObjectList<SubpassInputDescriptor> & GetSubpassInputList()const { return subpass_input; }
const ObjectList<SubpassInputDescriptor> & GetSubpassInputList()const{return subpass_input;}
public:
bool AddInput(ShaderStage *);