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

used AutoDelete<>.Finish() at CreateMaterial.

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy) 2023-06-15 16:07:11 +08:00
parent 0557ff2bae
commit 64235b12b6
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp
View File

@ -97,7 +97,7 @@ Material *RenderResource::CreateMaterial(const mtl::MaterialCreateInfo *mci)
if(!mci->GetFS()) if(!mci->GetFS())
return(nullptr); return(nullptr);
AutoDelete<Material> ad_mtl=new Material(mtl_name); AutoDelete<Material> mtl=new Material(mtl_name);
{ {
const ShaderModule *sm; const ShaderModule *sm;
@ -111,47 +111,45 @@ Material *RenderResource::CreateMaterial(const mtl::MaterialCreateInfo *mci)
if(!sm) if(!sm)
return(nullptr); return(nullptr);
ad_mtl->shader_maps->Add(sm); mtl->shader_maps->Add(sm);
++sci; ++sci;
} }
} }
CreateShaderStageList(ad_mtl->shader_stage_list,ad_mtl->shader_maps); CreateShaderStageList(mtl->shader_stage_list,mtl->shader_maps);
{ {
ShaderCreateInfoVertex *vert=mci->GetVS(); ShaderCreateInfoVertex *vert=mci->GetVS();
if(vert) if(vert)
ad_mtl->vertex_input=new VertexInput(vert->sdm->GetShaderStageIO().input); mtl->vertex_input=new VertexInput(vert->sdm->GetShaderStageIO().input);
} }
{ {
const auto &mdi=mci->GetMDI(); const auto &mdi=mci->GetMDI();
if(mdi.GetCount()>0) if(mdi.GetCount()>0)
ad_mtl->desc_manager=new MaterialDescriptorManager(mci->GetName(),mdi.Get()); mtl->desc_manager=new MaterialDescriptorManager(mci->GetName(),mdi.Get());
} }
ad_mtl->pipeline_layout_data=device->CreatePipelineLayoutData(ad_mtl->desc_manager); mtl->pipeline_layout_data=device->CreatePipelineLayoutData(mtl->desc_manager);
if(ad_mtl->desc_manager) if(mtl->desc_manager)
{ {
ENUM_CLASS_FOR(DescriptorSetType,int,dst) ENUM_CLASS_FOR(DescriptorSetType,int,dst)
{ {
if(ad_mtl->desc_manager->hasSet((DescriptorSetType)dst)) if(mtl->desc_manager->hasSet((DescriptorSetType)dst))
ad_mtl->mp_array[dst]=device->CreateMP(ad_mtl->desc_manager,ad_mtl->pipeline_layout_data,(DescriptorSetType)dst); mtl->mp_array[dst]=device->CreateMP(mtl->desc_manager,mtl->pipeline_layout_data,(DescriptorSetType)dst);
} }
} }
ad_mtl->mi_data_bytes =mci->GetMIDataBytes(); mtl->mi_data_bytes =mci->GetMIDataBytes();
ad_mtl->mi_max_count =mci->GetMIMaxCount(); mtl->mi_max_count =mci->GetMIMaxCount();
Material *mtl=ad_mtl.Finish();
Add(mtl); Add(mtl);
material_by_name.Add(mtl_name,mtl); material_by_name.Add(mtl_name,mtl);
return mtl; return mtl.Finish();
} }
VK_NAMESPACE_END VK_NAMESPACE_END