From a7c761e1c5680566d975854f649118f0a99ac436 Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Tue, 21 Mar 2023 21:46:16 +0800 Subject: [PATCH] renamed value. --- inc/hgl/graph/VKMaterial.h | 4 ++-- inc/hgl/graph/VKMaterialParameters.h | 2 +- src/SceneGraph/Vulkan/VKDeviceMaterial.cpp | 22 +++++++++---------- src/SceneGraph/Vulkan/VKMaterial.cpp | 4 ++-- .../Vulkan/VKMaterialParameters.cpp | 12 +++++----- .../Vulkan/VKPipelineLayoutData.cpp | 6 ++--- .../Vulkan/VKRenderResourceMaterial.cpp | 8 +++---- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/inc/hgl/graph/VKMaterial.h b/inc/hgl/graph/VKMaterial.h index 35c16624..868ad7a0 100644 --- a/inc/hgl/graph/VKMaterial.h +++ b/inc/hgl/graph/VKMaterial.h @@ -19,7 +19,7 @@ struct MaterialData ShaderModuleMap *shader_maps; - MaterialDescriptorManager *mds; + MaterialDescriptorManager *desc_manager; ShaderStageCreateInfoList shader_stage_list; @@ -59,7 +59,7 @@ public: 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 PipelineLayoutData * GetPipelineLayoutData ()const{return data->pipeline_layout_data;} diff --git a/inc/hgl/graph/VKMaterialParameters.h b/inc/hgl/graph/VKMaterialParameters.h index fa702954..d1328e14 100644 --- a/inc/hgl/graph/VKMaterialParameters.h +++ b/inc/hgl/graph/VKMaterialParameters.h @@ -8,7 +8,7 @@ VK_NAMESPACE_BEGIN class MaterialParameters { - const MaterialDescriptorManager *mds; + const MaterialDescriptorManager *desc_manager; DescriptorSetType set_type; diff --git a/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp b/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp index 47d21131..dfc18750 100644 --- a/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp +++ b/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp @@ -31,9 +31,9 @@ DescriptorSet *GPUDevice::CreateDS(const PipelineLayoutData *pld,const Descripto 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(desc_set_type)) return(nullptr); @@ -44,10 +44,10 @@ MaterialParameters *GPUDevice::CreateMP(const MaterialDescriptorManager *mds,con #ifdef _DEBUG const UTF8String addr_string=HexToString((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 - 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) @@ -77,19 +77,19 @@ void CreateShaderStageList(List &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(); if(shader_count<1) return(nullptr); - PipelineLayoutData *pld=CreatePipelineLayoutData(mds); + PipelineLayoutData *pld=CreatePipelineLayoutData(desc_manager); if(!pld) { delete shader_maps; - SAFE_CLEAR(mds); + SAFE_CLEAR(desc_manager); return(nullptr); } @@ -97,19 +97,19 @@ Material *GPUDevice::CreateMaterial(const UTF8String &mtl_name,ShaderModuleMap * data->name =mtl_name; data->shader_maps =shader_maps; - data->mds =mds; + data->desc_manager =desc_manager; data->vertex_input =vi; CreateShaderStageList(data->shader_stage_list,shader_maps); data->pipeline_layout_data=pld; - if(mds) + if(desc_manager) { ENUM_CLASS_FOR(DescriptorSetType,int,dst) { - if(mds->hasSet((DescriptorSetType)dst)) - data->mp_array[dst]=CreateMP(mds,pld,(DescriptorSetType)dst); + if(desc_manager->hasSet((DescriptorSetType)dst)) + data->mp_array[dst]=CreateMP(desc_manager,pld,(DescriptorSetType)dst); else data->mp_array[dst]=nullptr; } diff --git a/src/SceneGraph/Vulkan/VKMaterial.cpp b/src/SceneGraph/Vulkan/VKMaterial.cpp index 71dae5db..bd7b9d57 100644 --- a/src/SceneGraph/Vulkan/VKMaterial.cpp +++ b/src/SceneGraph/Vulkan/VKMaterial.cpp @@ -11,7 +11,7 @@ MaterialData::~MaterialData() delete mp_array[i]; delete shader_maps; - SAFE_CLEAR(mds); + SAFE_CLEAR(desc_manager); delete vertex_input; } @@ -29,7 +29,7 @@ const VkPipelineLayout Material::GetPipelineLayout()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) diff --git a/src/SceneGraph/Vulkan/VKMaterialParameters.cpp b/src/SceneGraph/Vulkan/VKMaterialParameters.cpp index 8ebbd096..acd50ed4 100644 --- a/src/SceneGraph/Vulkan/VKMaterialParameters.cpp +++ b/src/SceneGraph/Vulkan/VKMaterialParameters.cpp @@ -4,9 +4,9 @@ #include 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; descriptor_set=ds; } @@ -21,7 +21,7 @@ bool MaterialParameters::BindUBO(const AnsiString &name,DeviceBuffer *ubo,bool d if(name.IsEmpty()||!ubo) return(false); - const int index=mds->GetUBO(name,dynamic); + const int index=desc_manager->GetUBO(name,dynamic); if(index<0) return(false); @@ -37,7 +37,7 @@ bool MaterialParameters::BindSSBO(const AnsiString &name,DeviceBuffer *ssbo,bool if(name.IsEmpty()||!ssbo) return(false); - const int index=mds->GetSSBO(name,dynamic); + const int index=desc_manager->GetSSBO(name,dynamic); if(index<0) return(false); @@ -53,7 +53,7 @@ bool MaterialParameters::BindImageSampler(const AnsiString &name,Texture *tex,Sa if(name.IsEmpty()||!tex||!sampler) return(false); - const int index=mds->GetImageSampler(name); + const int index=desc_manager->GetImageSampler(name); if(index<0) return(false); @@ -69,7 +69,7 @@ bool MaterialParameters::BindInputAttachment(const AnsiString &name,ImageView *i if(name.IsEmpty()||!iv) return(false); - const int index=mds->GetInputAttachment(name); + const int index=desc_manager->GetInputAttachment(name); if(index<0) return(false); diff --git a/src/SceneGraph/Vulkan/VKPipelineLayoutData.cpp b/src/SceneGraph/Vulkan/VKPipelineLayoutData.cpp index 6b5a249a..12a471a7 100644 --- a/src/SceneGraph/Vulkan/VKPipelineLayoutData.cpp +++ b/src/SceneGraph/Vulkan/VKPipelineLayoutData.cpp @@ -4,15 +4,15 @@ #include VK_NAMESPACE_BEGIN -PipelineLayoutData *GPUDevice::CreatePipelineLayoutData(const MaterialDescriptorManager *mds) +PipelineLayoutData *GPUDevice::CreatePipelineLayoutData(const MaterialDescriptorManager *desc_manager) { PipelineLayoutData *pld=hgl_zero_new(); - if(mds) + if(desc_manager) { 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) continue; diff --git a/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp b/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp index e6464015..9574ca58 100644 --- a/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp +++ b/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp @@ -166,7 +166,7 @@ Material *RenderResource::CreateMaterial(const OSString &filename) const UTF8String mtl_name=ToUTF8String(filename); - MaterialDescriptorManager *mds=nullptr; + MaterialDescriptorManager *desc_manager=nullptr; { uint8 count; cbr.Read(count); @@ -177,7 +177,7 @@ Material *RenderResource::CreateMaterial(const OSString &filename) 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; } @@ -185,12 +185,12 @@ Material *RenderResource::CreateMaterial(const OSString &filename) 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); } else { - SAFE_CLEAR(mds); + SAFE_CLEAR(desc_manager); delete smm; mtl=nullptr; }