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

renamed value.

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy) 2023-03-21 21:46:16 +08:00
parent 44620abc21
commit a7c761e1c5
7 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/hgl/graph/VKMaterial.h
View File

@ -19,7 +19,7 @@ struct MaterialData
ShaderModuleMap *shader_maps; ShaderModuleMap *shader_maps;
MaterialDescriptorManager *mds; MaterialDescriptorManager *desc_manager;
ShaderStageCreateInfoList shader_stage_list; ShaderStageCreateInfoList shader_stage_list;
@ -59,7 +59,7 @@ public:
const ShaderStageCreateInfoList & GetStageList ()const{return data->shader_stage_list;} const ShaderStageCreateInfoList & GetStageList ()const{return data->shader_stage_list;}
const MaterialDescriptorManager * GetDescriptorSets ()const{return data->mds;} const MaterialDescriptorManager * GetDescriptorSets ()const{return data->desc_manager;}
const VkPipelineLayout GetPipelineLayout ()const; const VkPipelineLayout GetPipelineLayout ()const;
const PipelineLayoutData * GetPipelineLayoutData ()const{return data->pipeline_layout_data;} const PipelineLayoutData * GetPipelineLayoutData ()const{return data->pipeline_layout_data;}

2
inc/hgl/graph/VKMaterialParameters.h
View File

@ -8,7 +8,7 @@
VK_NAMESPACE_BEGIN VK_NAMESPACE_BEGIN
class MaterialParameters class MaterialParameters
{ {
const MaterialDescriptorManager *mds; const MaterialDescriptorManager *desc_manager;
DescriptorSetType set_type; DescriptorSetType set_type;

22
src/SceneGraph/Vulkan/VKDeviceMaterial.cpp
View File

@ -31,9 +31,9 @@ DescriptorSet *GPUDevice::CreateDS(const PipelineLayoutData *pld,const Descripto
return(new DescriptorSet(attr->device,binding_count,pld->pipeline_layout,desc_set)); return(new DescriptorSet(attr->device,binding_count,pld->pipeline_layout,desc_set));
} }
MaterialParameters *GPUDevice::CreateMP(const MaterialDescriptorManager *mds,const PipelineLayoutData *pld,const DescriptorSetType &desc_set_type) MaterialParameters *GPUDevice::CreateMP(const MaterialDescriptorManager *desc_manager,const PipelineLayoutData *pld,const DescriptorSetType &desc_set_type)
{ {
if(!mds||!pld)return(nullptr); if(!desc_manager||!pld)return(nullptr);
if(!RangeCheck<DescriptorSetType>(desc_set_type)) if(!RangeCheck<DescriptorSetType>(desc_set_type))
return(nullptr); return(nullptr);
@ -44,10 +44,10 @@ MaterialParameters *GPUDevice::CreateMP(const MaterialDescriptorManager *mds,con
#ifdef _DEBUG #ifdef _DEBUG
const UTF8String addr_string=HexToString<char,uint64_t>((uint64_t)(ds->GetDescriptorSet())); const UTF8String addr_string=HexToString<char,uint64_t>((uint64_t)(ds->GetDescriptorSet()));
LOG_INFO(U8_TEXT("Create [DescriptSets:")+addr_string+("] OK! Material Name: \"")+mds->GetMaterialName()+U8_TEXT("\" Type: ")+GetDescriptorSetTypeName(desc_set_type)); LOG_INFO(U8_TEXT("Create [DescriptSets:")+addr_string+("] OK! Material Name: \"")+desc_manager->GetMaterialName()+U8_TEXT("\" Type: ")+GetDescriptorSetTypeName(desc_set_type));
#endif//_DEBUG #endif//_DEBUG
return(new MaterialParameters(mds,desc_set_type,ds)); return(new MaterialParameters(desc_manager,desc_set_type,ds));
} }
MaterialParameters *GPUDevice::CreateMP(Material *mtl,const DescriptorSetType &desc_set_type) MaterialParameters *GPUDevice::CreateMP(Material *mtl,const DescriptorSetType &desc_set_type)
@ -77,19 +77,19 @@ void CreateShaderStageList(List<VkPipelineShaderStageCreateInfo> &shader_stage_l
} }
} }
Material *GPUDevice::CreateMaterial(const UTF8String &mtl_name,ShaderModuleMap *shader_maps,MaterialDescriptorManager *mds,VertexInput *vi) Material *GPUDevice::CreateMaterial(const UTF8String &mtl_name,ShaderModuleMap *shader_maps,MaterialDescriptorManager *desc_manager,VertexInput *vi)
{ {
const int shader_count=shader_maps->GetCount(); const int shader_count=shader_maps->GetCount();
if(shader_count<1) if(shader_count<1)
return(nullptr); return(nullptr);
PipelineLayoutData *pld=CreatePipelineLayoutData(mds); PipelineLayoutData *pld=CreatePipelineLayoutData(desc_manager);
if(!pld) if(!pld)
{ {
delete shader_maps; delete shader_maps;
SAFE_CLEAR(mds); SAFE_CLEAR(desc_manager);
return(nullptr); return(nullptr);
} }
@ -97,19 +97,19 @@ Material *GPUDevice::CreateMaterial(const UTF8String &mtl_name,ShaderModuleMap *
data->name =mtl_name; data->name =mtl_name;
data->shader_maps =shader_maps; data->shader_maps =shader_maps;
data->mds =mds; data->desc_manager =desc_manager;
data->vertex_input =vi; data->vertex_input =vi;
CreateShaderStageList(data->shader_stage_list,shader_maps); CreateShaderStageList(data->shader_stage_list,shader_maps);
data->pipeline_layout_data=pld; data->pipeline_layout_data=pld;
if(mds) if(desc_manager)
{ {
ENUM_CLASS_FOR(DescriptorSetType,int,dst) ENUM_CLASS_FOR(DescriptorSetType,int,dst)
{ {
if(mds->hasSet((DescriptorSetType)dst)) if(desc_manager->hasSet((DescriptorSetType)dst))
data->mp_array[dst]=CreateMP(mds,pld,(DescriptorSetType)dst); data->mp_array[dst]=CreateMP(desc_manager,pld,(DescriptorSetType)dst);
else else
data->mp_array[dst]=nullptr; data->mp_array[dst]=nullptr;
} }

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

@ -11,7 +11,7 @@ MaterialData::~MaterialData()
delete mp_array[i]; delete mp_array[i];
delete shader_maps; delete shader_maps;
SAFE_CLEAR(mds); SAFE_CLEAR(desc_manager);
delete vertex_input; delete vertex_input;
} }
@ -29,7 +29,7 @@ const VkPipelineLayout Material::GetPipelineLayout()const
const bool Material::hasSet(const DescriptorSetType &dst)const const bool Material::hasSet(const DescriptorSetType &dst)const
{ {
return data->mds->hasSet(dst); return data->desc_manager->hasSet(dst);
} }
VIL *Material::CreateVIL(const VILConfig *format_map) VIL *Material::CreateVIL(const VILConfig *format_map)

12
src/SceneGraph/Vulkan/VKMaterialParameters.cpp
View File

@ -4,9 +4,9 @@
#include<hgl/graph/VKDescriptorSet.h> #include<hgl/graph/VKDescriptorSet.h>
VK_NAMESPACE_BEGIN VK_NAMESPACE_BEGIN
MaterialParameters::MaterialParameters(const MaterialDescriptorManager *_mds,const DescriptorSetType &type,DescriptorSet *ds) MaterialParameters::MaterialParameters(const MaterialDescriptorManager *mdm,const DescriptorSetType &type,DescriptorSet *ds)
{ {
mds=_mds; desc_manager=mdm;
set_type=type; set_type=type;
descriptor_set=ds; descriptor_set=ds;
} }
@ -21,7 +21,7 @@ bool MaterialParameters::BindUBO(const AnsiString &name,DeviceBuffer *ubo,bool d
if(name.IsEmpty()||!ubo) if(name.IsEmpty()||!ubo)
return(false); return(false);
const int index=mds->GetUBO(name,dynamic); const int index=desc_manager->GetUBO(name,dynamic);
if(index<0) if(index<0)
return(false); return(false);
@ -37,7 +37,7 @@ bool MaterialParameters::BindSSBO(const AnsiString &name,DeviceBuffer *ssbo,bool
if(name.IsEmpty()||!ssbo) if(name.IsEmpty()||!ssbo)
return(false); return(false);
const int index=mds->GetSSBO(name,dynamic); const int index=desc_manager->GetSSBO(name,dynamic);
if(index<0) if(index<0)
return(false); return(false);
@ -53,7 +53,7 @@ bool MaterialParameters::BindImageSampler(const AnsiString &name,Texture *tex,Sa
if(name.IsEmpty()||!tex||!sampler) if(name.IsEmpty()||!tex||!sampler)
return(false); return(false);
const int index=mds->GetImageSampler(name); const int index=desc_manager->GetImageSampler(name);
if(index<0) if(index<0)
return(false); return(false);
@ -69,7 +69,7 @@ bool MaterialParameters::BindInputAttachment(const AnsiString &name,ImageView *i
if(name.IsEmpty()||!iv) if(name.IsEmpty()||!iv)
return(false); return(false);
const int index=mds->GetInputAttachment(name); const int index=desc_manager->GetInputAttachment(name);
if(index<0) if(index<0)
return(false); return(false);

6
src/SceneGraph/Vulkan/VKPipelineLayoutData.cpp
View File

@ -4,15 +4,15 @@
#include<hgl/graph/VKMaterialDescriptorManager.h> #include<hgl/graph/VKMaterialDescriptorManager.h>
VK_NAMESPACE_BEGIN VK_NAMESPACE_BEGIN
PipelineLayoutData *GPUDevice::CreatePipelineLayoutData(const MaterialDescriptorManager *mds) PipelineLayoutData *GPUDevice::CreatePipelineLayoutData(const MaterialDescriptorManager *desc_manager)
{ {
PipelineLayoutData *pld=hgl_zero_new<PipelineLayoutData>(); PipelineLayoutData *pld=hgl_zero_new<PipelineLayoutData>();
if(mds) if(desc_manager)
{ {
ENUM_CLASS_FOR(DescriptorSetType,int,i) ENUM_CLASS_FOR(DescriptorSetType,int,i)
{ {
const DescriptorSetLayoutCreateInfo *dslci=mds->GetDSLCI((DescriptorSetType)i); const DescriptorSetLayoutCreateInfo *dslci=desc_manager->GetDSLCI((DescriptorSetType)i);
if(!dslci||dslci->bindingCount<=0) if(!dslci||dslci->bindingCount<=0)
continue; continue;

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

@ -166,7 +166,7 @@ Material *RenderResource::CreateMaterial(const OSString &filename)
const UTF8String mtl_name=ToUTF8String(filename); const UTF8String mtl_name=ToUTF8String(filename);
MaterialDescriptorManager *mds=nullptr; MaterialDescriptorManager *desc_manager=nullptr;
{ {
uint8 count; uint8 count;
cbr.Read(count); cbr.Read(count);
@ -177,7 +177,7 @@ Material *RenderResource::CreateMaterial(const OSString &filename)
LoadShaderDescriptor(cbr,sd_list,count,ver); LoadShaderDescriptor(cbr,sd_list,count,ver);
mds=new MaterialDescriptorManager(mtl_name,sd_list,count); desc_manager=new MaterialDescriptorManager(mtl_name,sd_list,count);
delete[] sd_list; delete[] sd_list;
} }
@ -185,12 +185,12 @@ Material *RenderResource::CreateMaterial(const OSString &filename)
if(result&&vertex_input) if(result&&vertex_input)
{ {
mtl=device->CreateMaterial(mtl_name,smm,mds,vertex_input); mtl=device->CreateMaterial(mtl_name,smm,desc_manager,vertex_input);
Add(mtl); Add(mtl);
} }
else else
{ {
SAFE_CLEAR(mds); SAFE_CLEAR(desc_manager);
delete smm; delete smm;
mtl=nullptr; mtl=nullptr;
} }