From 85530e6d57f5c26a0178369215c37a7a79b6ff84 Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Mon, 20 Mar 2023 13:55:47 +0800 Subject: [PATCH] renamed to MaterialDescriptorManager from MaterialDescriptorSets --- inc/hgl/graph/VK.h | 2 +- inc/hgl/graph/VKDevice.h | 6 +++--- inc/hgl/graph/VKMaterial.h | 4 ++-- ...criptorSets.h => VKMaterialDescriptorManager.h} | 14 +++++++------- inc/hgl/graph/VKMaterialParameters.h | 4 ++-- src/SceneGraph/CMakeLists.txt | 4 ++-- src/SceneGraph/Vulkan/VKDeviceMaterial.cpp | 6 +++--- src/SceneGraph/Vulkan/VKMaterial.cpp | 2 +- ...torSets.cpp => VKMaterialDescriptorManager.cpp} | 8 ++++---- src/SceneGraph/Vulkan/VKMaterialParameters.cpp | 4 ++-- src/SceneGraph/Vulkan/VKPipelineLayoutData.cpp | 4 ++-- src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp | 6 +++--- 12 files changed, 32 insertions(+), 32 deletions(-) rename inc/hgl/graph/{VKMaterialDescriptorSets.h => VKMaterialDescriptorManager.h} (81%) rename src/SceneGraph/Vulkan/{VKMaterialDescriptorSets.cpp => VKMaterialDescriptorManager.cpp} (87%) diff --git a/inc/hgl/graph/VK.h b/inc/hgl/graph/VK.h index 7715f3e2..9bbb3333 100644 --- a/inc/hgl/graph/VK.h +++ b/inc/hgl/graph/VK.h @@ -76,7 +76,7 @@ struct ShaderAttribute; class ShaderResource; class ShaderModule; class ShaderModuleMap; -class MaterialDescriptorSets; +class MaterialDescriptorManager; class Material; class MaterialParameters; diff --git a/inc/hgl/graph/VKDevice.h b/inc/hgl/graph/VKDevice.h index 02535d08..a3904473 100644 --- a/inc/hgl/graph/VKDevice.h +++ b/inc/hgl/graph/VKDevice.h @@ -217,16 +217,16 @@ public: // public: //shader & material - PipelineLayoutData *CreatePipelineLayoutData(const MaterialDescriptorSets *); + PipelineLayoutData *CreatePipelineLayoutData(const MaterialDescriptorManager *); void Destroy(PipelineLayoutData *); DescriptorSet * CreateDS(const PipelineLayoutData *,const DescriptorSetType &type)const; - MaterialParameters *CreateMP(const MaterialDescriptorSets *,const PipelineLayoutData *,const DescriptorSetType &); + MaterialParameters *CreateMP(const MaterialDescriptorManager *,const PipelineLayoutData *,const DescriptorSetType &); MaterialParameters *CreateMP(Material *,const DescriptorSetType &); ShaderModule *CreateShaderModule(VkShaderStageFlagBits,const uint32_t *,const size_t); - Material *CreateMaterial(const UTF8String &mtl_name,ShaderModuleMap *shader_maps,MaterialDescriptorSets *,VertexInput *); + Material *CreateMaterial(const UTF8String &mtl_name,ShaderModuleMap *shader_maps,MaterialDescriptorManager *,VertexInput *); MaterialInstance *CreateMI(Material *,const VILConfig *vil_cfg=nullptr); diff --git a/inc/hgl/graph/VKMaterial.h b/inc/hgl/graph/VKMaterial.h index 6895c099..65f489f5 100644 --- a/inc/hgl/graph/VKMaterial.h +++ b/inc/hgl/graph/VKMaterial.h @@ -19,7 +19,7 @@ struct MaterialData ShaderModuleMap *shader_maps; - MaterialDescriptorSets *mds; + MaterialDescriptorManager *mds; ShaderStageCreateInfoList shader_stage_list; @@ -59,7 +59,7 @@ public: const ShaderStageCreateInfoList & GetStageList ()const{return data->shader_stage_list;} - const MaterialDescriptorSets * GetDescriptorSets ()const{return data->mds;} + const MaterialDescriptorManager * GetDescriptorSets ()const{return data->mds;} const VkPipelineLayout GetPipelineLayout ()const; const PipelineLayoutData * GetPipelineLayoutData ()const{return data->pipeline_layout_data;} diff --git a/inc/hgl/graph/VKMaterialDescriptorSets.h b/inc/hgl/graph/VKMaterialDescriptorManager.h similarity index 81% rename from inc/hgl/graph/VKMaterialDescriptorSets.h rename to inc/hgl/graph/VKMaterialDescriptorManager.h index 6a7fa677..8b228916 100644 --- a/inc/hgl/graph/VKMaterialDescriptorSets.h +++ b/inc/hgl/graph/VKMaterialDescriptorManager.h @@ -1,11 +1,11 @@ -#ifndef HGL_GRAPH_VULKAN_MATERIAL_DESCRIPTOR_SETS_INCLUDE -#define HGL_GRAPH_VULKAN_MATERIAL_DESCRIPTOR_SETS_INCLUDE +#ifndef HGL_GRAPH_VULKAN_MATERIAL_DESCRIPTOR_MANAGER_INCLUDE +#define HGL_GRAPH_VULKAN_MATERIAL_DESCRIPTOR_MANAGER_INCLUDE #include #include VK_NAMESPACE_BEGIN -class MaterialDescriptorSets +class MaterialDescriptorManager { UTF8String mtl_name; @@ -21,8 +21,8 @@ private: public: - MaterialDescriptorSets(const UTF8String &,ShaderDescriptor *,const uint); - ~MaterialDescriptorSets(); + MaterialDescriptorManager(const UTF8String &,ShaderDescriptor *,const uint); + ~MaterialDescriptorManager(); const UTF8String &GetMaterialName()const{return mtl_name;} @@ -39,6 +39,6 @@ public: const bool hasSet(const DescriptorSetType &type)const{return set_has_desc[size_t(type)];} //!sd_list_by_set_type[size_t(type)].IsEmpty();} -};//class MaterialDescriptorSets +};//class MaterialDescriptorManager VK_NAMESPACE_END -#endif//HGL_GRAPH_VULKAN_MATERIAL_DESCRIPTOR_SETS_INCLUDE +#endif//HGL_GRAPH_VULKAN_MATERIAL_DESCRIPTOR_MANAGER_INCLUDE diff --git a/inc/hgl/graph/VKMaterialParameters.h b/inc/hgl/graph/VKMaterialParameters.h index 24d9074f..fa702954 100644 --- a/inc/hgl/graph/VKMaterialParameters.h +++ b/inc/hgl/graph/VKMaterialParameters.h @@ -8,7 +8,7 @@ VK_NAMESPACE_BEGIN class MaterialParameters { - const MaterialDescriptorSets *mds; + const MaterialDescriptorManager *mds; DescriptorSetType set_type; @@ -18,7 +18,7 @@ private: friend class GPUDevice; - MaterialParameters(const MaterialDescriptorSets *,const DescriptorSetType &type,DescriptorSet *); + MaterialParameters(const MaterialDescriptorManager *,const DescriptorSetType &type,DescriptorSet *); public: diff --git a/src/SceneGraph/CMakeLists.txt b/src/SceneGraph/CMakeLists.txt index c037202c..bca7eabc 100644 --- a/src/SceneGraph/CMakeLists.txt +++ b/src/SceneGraph/CMakeLists.txt @@ -94,8 +94,8 @@ SET(VK_RR_SHADER_FILES ${SG_INCLUDE_PATH}/VKShaderResource.h SOURCE_GROUP("Vulkan\\RenderResource\\Shader" FILES ${VK_RR_SHADER_FILES}) -SET(VK_RR_MATERIAL_FILES ${SG_INCLUDE_PATH}/VKMaterialDescriptorSets.h - Vulkan/VKMaterialDescriptorSets.cpp) +SET(VK_RR_MATERIAL_FILES ${SG_INCLUDE_PATH}/VKMaterialDescriptorManager.h + Vulkan/VKMaterialDescriptorManager.cpp) SOURCE_GROUP("Vulkan\\RenderResource\\Material" FILES ${VK_RR_MATERIAL_FILES}) diff --git a/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp b/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp index bc577f69..47d21131 100644 --- a/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp +++ b/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include #include @@ -31,7 +31,7 @@ DescriptorSet *GPUDevice::CreateDS(const PipelineLayoutData *pld,const Descripto return(new DescriptorSet(attr->device,binding_count,pld->pipeline_layout,desc_set)); } -MaterialParameters *GPUDevice::CreateMP(const MaterialDescriptorSets *mds,const PipelineLayoutData *pld,const DescriptorSetType &desc_set_type) +MaterialParameters *GPUDevice::CreateMP(const MaterialDescriptorManager *mds,const PipelineLayoutData *pld,const DescriptorSetType &desc_set_type) { if(!mds||!pld)return(nullptr); if(!RangeCheck(desc_set_type)) @@ -77,7 +77,7 @@ void CreateShaderStageList(List &shader_stage_l } } -Material *GPUDevice::CreateMaterial(const UTF8String &mtl_name,ShaderModuleMap *shader_maps,MaterialDescriptorSets *mds,VertexInput *vi) +Material *GPUDevice::CreateMaterial(const UTF8String &mtl_name,ShaderModuleMap *shader_maps,MaterialDescriptorManager *mds,VertexInput *vi) { const int shader_count=shader_maps->GetCount(); diff --git a/src/SceneGraph/Vulkan/VKMaterial.cpp b/src/SceneGraph/Vulkan/VKMaterial.cpp index 8f05e410..71dae5db 100644 --- a/src/SceneGraph/Vulkan/VKMaterial.cpp +++ b/src/SceneGraph/Vulkan/VKMaterial.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include"VKPipelineLayoutData.h" VK_NAMESPACE_BEGIN diff --git a/src/SceneGraph/Vulkan/VKMaterialDescriptorSets.cpp b/src/SceneGraph/Vulkan/VKMaterialDescriptorManager.cpp similarity index 87% rename from src/SceneGraph/Vulkan/VKMaterialDescriptorSets.cpp rename to src/SceneGraph/Vulkan/VKMaterialDescriptorManager.cpp index 4c59b37f..2caf6949 100644 --- a/src/SceneGraph/Vulkan/VKMaterialDescriptorSets.cpp +++ b/src/SceneGraph/Vulkan/VKMaterialDescriptorManager.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include @@ -12,7 +12,7 @@ void WriteDescriptorSetLayoutBinding(VkDescriptorSetLayoutBinding *dslb,ShaderDe dslb->pImmutableSamplers=nullptr; } -MaterialDescriptorSets::MaterialDescriptorSets(const UTF8String &name,ShaderDescriptor *sd_list,const uint sd_count) +MaterialDescriptorManager::MaterialDescriptorManager(const UTF8String &name,ShaderDescriptor *sd_list,const uint sd_count) { mtl_name=name; @@ -82,12 +82,12 @@ MaterialDescriptorSets::MaterialDescriptorSets(const UTF8String &name,ShaderDesc } } -MaterialDescriptorSets::~MaterialDescriptorSets() +MaterialDescriptorManager::~MaterialDescriptorManager() { delete[] all_dslb; } -const int MaterialDescriptorSets::GetBinding(const VkDescriptorType &desc_type,const AnsiString &name)const +const int MaterialDescriptorManager::GetBinding(const VkDescriptorType &desc_type,const AnsiString &name)const { if(desc_typeVK_DESCRIPTOR_TYPE_END_RANGE) diff --git a/src/SceneGraph/Vulkan/VKMaterialParameters.cpp b/src/SceneGraph/Vulkan/VKMaterialParameters.cpp index 435dc8de..8ebbd096 100644 --- a/src/SceneGraph/Vulkan/VKMaterialParameters.cpp +++ b/src/SceneGraph/Vulkan/VKMaterialParameters.cpp @@ -1,10 +1,10 @@ #include -#include +#include #include #include VK_NAMESPACE_BEGIN -MaterialParameters::MaterialParameters(const MaterialDescriptorSets *_mds,const DescriptorSetType &type,DescriptorSet *ds) +MaterialParameters::MaterialParameters(const MaterialDescriptorManager *_mds,const DescriptorSetType &type,DescriptorSet *ds) { mds=_mds; set_type=type; diff --git a/src/SceneGraph/Vulkan/VKPipelineLayoutData.cpp b/src/SceneGraph/Vulkan/VKPipelineLayoutData.cpp index 767499f0..6b5a249a 100644 --- a/src/SceneGraph/Vulkan/VKPipelineLayoutData.cpp +++ b/src/SceneGraph/Vulkan/VKPipelineLayoutData.cpp @@ -1,10 +1,10 @@ #include"VKPipelineLayoutData.h" #include #include -#include +#include VK_NAMESPACE_BEGIN -PipelineLayoutData *GPUDevice::CreatePipelineLayoutData(const MaterialDescriptorSets *mds) +PipelineLayoutData *GPUDevice::CreatePipelineLayoutData(const MaterialDescriptorManager *mds) { PipelineLayoutData *pld=hgl_zero_new(); diff --git a/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp b/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp index a8c55ee7..2ca29d53 100644 --- a/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp +++ b/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include #include @@ -165,7 +165,7 @@ Material *RenderResource::CreateMaterial(const OSString &filename) const UTF8String mtl_name=ToUTF8String(filename); - MaterialDescriptorSets *mds=nullptr; + MaterialDescriptorManager *mds=nullptr; { uint8 count; cbr.Read(count); @@ -176,7 +176,7 @@ Material *RenderResource::CreateMaterial(const OSString &filename) LoadShaderDescriptor(cbr,sd_list,count,ver); - mds=new MaterialDescriptorSets(mtl_name,sd_list,count); + mds=new MaterialDescriptorManager(mtl_name,sd_list,count); delete[] sd_list; }