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

add mtl_name at Material

Browse Source
This commit is contained in:
hyzboy 2021-05-10 15:20:52 +08:00
parent db9bac3edd
commit 7b7e702a16
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/SceneGraph/Vulkan/VKMaterial.cpp
View File

@ -7,7 +7,7 @@
#include<hgl/graph/VKBuffer.h> #include<hgl/graph/VKBuffer.h>
#include"VKDescriptorSetLayoutCreater.h" #include"VKDescriptorSetLayoutCreater.h"
VK_NAMESPACE_BEGIN VK_NAMESPACE_BEGIN
Material *GPUDevice::CreateMaterial(ShaderModuleMap *shader_maps) Material *GPUDevice::CreateMaterial(const UTF8String &mtl_name,ShaderModuleMap *shader_maps)
{ {
const int shader_count=shader_maps->GetCount(); const int shader_count=shader_maps->GetCount();
@ -46,10 +46,10 @@ Material *GPUDevice::CreateMaterial(ShaderModuleMap *shader_maps)
return(nullptr); return(nullptr);
} }
return(new Material(shader_maps,shader_stage_list,dsl_creater)); return(new Material(mtl_name,shader_maps,shader_stage_list,dsl_creater));
} }
Material *GPUDevice::CreateMaterial(const VertexShaderModule *vertex_shader_module,const ShaderModule *fragment_shader_module) Material *GPUDevice::CreateMaterial(const UTF8String &mtl_name,const VertexShaderModule *vertex_shader_module,const ShaderModule *fragment_shader_module)
{ {
if(!vertex_shader_module||!fragment_shader_module) if(!vertex_shader_module||!fragment_shader_module)
return(nullptr); return(nullptr);
@ -62,10 +62,10 @@ Material *GPUDevice::CreateMaterial(const VertexShaderModule *vertex_shader_modu
smm->Add(vertex_shader_module); smm->Add(vertex_shader_module);
smm->Add(fragment_shader_module); smm->Add(fragment_shader_module);
return CreateMaterial(smm); return CreateMaterial(mtl_name,smm);
} }
Material *GPUDevice::CreateMaterial(const VertexShaderModule *vertex_shader_module,const ShaderModule *geometry_shader_module,const ShaderModule *fragment_shader_module) Material *GPUDevice::CreateMaterial(const UTF8String &mtl_name,const VertexShaderModule *vertex_shader_module,const ShaderModule *geometry_shader_module,const ShaderModule *fragment_shader_module)
{ {
if(!vertex_shader_module if(!vertex_shader_module
||!geometry_shader_module ||!geometry_shader_module
@ -82,11 +82,12 @@ Material *GPUDevice::CreateMaterial(const VertexShaderModule *vertex_shader_modu
smm->Add(geometry_shader_module); smm->Add(geometry_shader_module);
smm->Add(fragment_shader_module); smm->Add(fragment_shader_module);
return CreateMaterial(smm); return CreateMaterial(mtl_name,smm);
} }
Material::Material(ShaderModuleMap *smm,List<VkPipelineShaderStageCreateInfo> *psci_list,DescriptorSetLayoutCreater *dslc) Material::Material(const UTF8String &name,ShaderModuleMap *smm,List<VkPipelineShaderStageCreateInfo> *psci_list,DescriptorSetLayoutCreater *dslc)
{ {
mtl_name=name;
shader_maps=smm; shader_maps=smm;
shader_stage_list=psci_list; shader_stage_list=psci_list;
dsl_creater=dslc; dsl_creater=dslc;