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

renamed values's name.

Browse Source
This commit is contained in:
hyzboy 2024-07-27 19:13:35 +08:00
parent 0c669807d7
commit bd4fc34cbb
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ShaderGen/2d/Std2DMaterialLoader.cpp
View File

@ -31,11 +31,11 @@ namespace
if(!Std2DMaterial::BeginCustomShader()) if(!Std2DMaterial::BeginCustomShader())
return(false); return(false);
if(mfd->mi.mi_bytes>0) if(mfd->mi_data.data_bytes>0)
{ {
mci->SetMaterialInstance( mfd->mi.code, mci->SetMaterialInstance( mfd->mi_data.code,
mfd->mi.mi_bytes, mfd->mi_data.data_bytes,
mfd->mi.shader_stage_flag_bits); mfd->mi_data.shader_stage_flag_bits);
} }
for(const auto ubo:mfd->ubo_list) for(const auto ubo:mfd->ubo_list)
@ -56,7 +56,7 @@ namespace
template<VkShaderStageFlagBits ss,typename SD,typename SCI> template<VkShaderStageFlagBits ss,typename SD,typename SCI>
SD *CommonProc(SCI *sc) SD *CommonProc(SCI *sc)
{ {
SD *sd=(SD *)(mfd->shader[ss]); SD *sd=(SD *)(mfd->shader_data_map[ss]);
if(!sd) if(!sd)
return(nullptr); return(nullptr);
@ -73,7 +73,7 @@ namespace
bool CustomVertexShader(ShaderCreateInfoVertex *vsc) override bool CustomVertexShader(ShaderCreateInfoVertex *vsc) override
{ {
vsc->AddInput(mfd->via); vsc->AddInput(mfd->via_list);
if(!Std2DMaterial::CustomVertexShader(vsc)) if(!Std2DMaterial::CustomVertexShader(vsc))
return(false); return(false);
@ -112,7 +112,7 @@ MaterialCreateInfo *LoadMaterialFromFile(const AnsiString &name,Material2DCreate
if(!mfd) if(!mfd)
return nullptr; return nullptr;
if(mfd->mi.mi_bytes>0) if(mfd->mi_data.data_bytes>0)
cfg->material_instance=true; cfg->material_instance=true;
cfg->shader_stage_flag_bit=mfd->shader_stage_flag_bit; cfg->shader_stage_flag_bit=mfd->shader_stage_flag_bit;

14
src/ShaderGen/3d/Std3DMaterialLoader.cpp
View File

@ -44,11 +44,11 @@ namespace
ubo.name); ubo.name);
} }
if(mfd->mi.mi_bytes>0) if(mfd->mi_data.data_bytes>0)
{ {
mci->SetMaterialInstance(mfd->mi.code, mci->SetMaterialInstance(mfd->mi_data.code,
mfd->mi.mi_bytes, mfd->mi_data.data_bytes,
mfd->mi.shader_stage_flag_bits); mfd->mi_data.shader_stage_flag_bits);
} }
return true; return true;
@ -57,7 +57,7 @@ namespace
template<VkShaderStageFlagBits ss,typename SD,typename SCI> template<VkShaderStageFlagBits ss,typename SD,typename SCI>
SD *CommonProc(SCI *sc) SD *CommonProc(SCI *sc)
{ {
SD *sd=(SD *)(mfd->shader[ss]); SD *sd=(SD *)(mfd->shader_data_map[ss]);
if(!sd) if(!sd)
return (nullptr); return (nullptr);
@ -74,7 +74,7 @@ namespace
bool CustomVertexShader(ShaderCreateInfoVertex *vsc) override bool CustomVertexShader(ShaderCreateInfoVertex *vsc) override
{ {
vsc->AddInput(mfd->via); vsc->AddInput(mfd->via_list);
if(!Std3DMaterial::CustomVertexShader(vsc)) if(!Std3DMaterial::CustomVertexShader(vsc))
return (false); return (false);
@ -113,7 +113,7 @@ MaterialCreateInfo *LoadMaterialFromFile(const AnsiString &name,Material3DCreate
if(!mfd) if(!mfd)
return nullptr; return nullptr;
if(mfd->mi.mi_bytes>0) if(mfd->mi_data.data_bytes>0)
cfg->material_instance=true; cfg->material_instance=true;
cfg->shader_stage_flag_bit=mfd->shader_stage_flag_bit; cfg->shader_stage_flag_bit=mfd->shader_stage_flag_bit;

8
src/ShaderGen/MaterialFileData.h
View File

@ -20,7 +20,7 @@ namespace material_file
const char *code; const char *code;
uint code_length; uint code_length;
uint mi_bytes; uint data_bytes;
uint32_t shader_stage_flag_bits; uint32_t shader_stage_flag_bits;
}; };
@ -127,13 +127,13 @@ namespace material_file
AnsiStringList require_list; ///<需求的内部模块(如LocalToWorld,Sun,Shadow等系统内置元素) AnsiStringList require_list; ///<需求的内部模块(如LocalToWorld,Sun,Shadow等系统内置元素)
// AnsiStringList import_list; ///<引用的外部模块 // AnsiStringList import_list; ///<引用的外部模块
MaterialInstanceData mi{}; MaterialInstanceData mi_data{};
VIAList via; ///<Vertex Input VIAList via_list; ///<Vertex Input
UBODataList ubo_list; UBODataList ubo_list;
ShaderDataMap shader; ShaderDataMap shader_data_map;
uint32_t shader_stage_flag_bit; uint32_t shader_stage_flag_bit;

8
src/ShaderGen/MaterialFileLoader.cpp
View File

@ -306,7 +306,7 @@ namespace
{ {
mid->code =code_parse.start; mid->code =code_parse.start;
mid->code_length =code_parse.end-code_parse.start; mid->code_length =code_parse.end-code_parse.start;
mid->mi_bytes =mi_bytes; mid->data_bytes =mi_bytes;
mid->shader_stage_flag_bits =shader_stage_flag_bits; mid->shader_stage_flag_bits =shader_stage_flag_bits;
} }
} }
@ -655,10 +655,10 @@ namespace
parse=new MaterialBlockParse(&(mfd->require_list),&(mfd->ubo_list)); parse=new MaterialBlockParse(&(mfd->require_list),&(mfd->ubo_list));
else else
if(state==MaterialFileBlock::MaterialInstance) if(state==MaterialFileBlock::MaterialInstance)
parse=new MaterialInstanceBlockParse(&(mfd->mi)); parse=new MaterialInstanceBlockParse(&(mfd->mi_data));
else else
if(state==MaterialFileBlock::VertexInput) if(state==MaterialFileBlock::VertexInput)
parse=new VertexInputBlockParse(&(mfd->via)); parse=new VertexInputBlockParse(&(mfd->via_list));
else else
if(state>=MaterialFileBlock::Vertex if(state>=MaterialFileBlock::Vertex
&&state<=MaterialFileBlock::Fragment) &&state<=MaterialFileBlock::Fragment)
@ -689,7 +689,7 @@ namespace
if(!sd) if(!sd)
return(false); return(false);
mfd->shader.Add(sd->GetShaderStage(),sd); mfd->shader_data_map.Add(sd->GetShaderStage(),sd);
mfd->shader_stage_flag_bit|=sd->GetShaderStage(); mfd->shader_stage_flag_bit|=sd->GetShaderStage();
} }