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

renamed to MaterialDescriptorManager from MaterialDescriptorSets

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy)
2023-03-20 13:55:47 +08:00
parent 81e2aac321
commit 85530e6d57
12 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,7 @@ struct ShaderAttribute;
class ShaderResource;
class ShaderModule;
class ShaderModuleMap;
class MaterialDescriptorSets;
class MaterialDescriptorManager;
class Material;
class MaterialParameters;

6
inc/hgl/graph/VKDevice.h
View File

@@ -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);

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

@@ -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;}

14
inc/hgl/graph/VKMaterialDescriptorSets.h → inc/hgl/graph/VKMaterialDescriptorManager.h
View File

@@ -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<hgl/graph/VK.h>
#include<hgl/graph/VKShaderDescriptor.h>
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

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

@@ -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: