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

removed sd_list for MaterialDescriptorSets

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy) 2023-03-19 20:41:12 +08:00
parent aed56a35e0
commit 3a378be660
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
inc/hgl/graph/VKMaterialDescriptorSets.h
View File

@ -9,9 +9,6 @@ class MaterialDescriptorSets
{
UTF8String mtl_name;
ShaderDescriptor *sd_list;
uint sd_count;
//ShaderDescriptorList sd_list_by_set_type[size_t(DescriptorSetType::RANGE_SIZE)];
bool set_has_desc[size_t(DescriptorSetType::RANGE_SIZE)];

7
src/SceneGraph/Vulkan/VKMaterialDescriptorSets.cpp
View File

@ -12,13 +12,10 @@ void WriteDescriptorSetLayoutBinding(VkDescriptorSetLayoutBinding *dslb,ShaderDe
dslb->pImmutableSamplers=nullptr;
}
MaterialDescriptorSets::MaterialDescriptorSets(const UTF8String &name,ShaderDescriptor *sd,const uint count)
MaterialDescriptorSets::MaterialDescriptorSets(const UTF8String &name,ShaderDescriptor *sd_list,const uint sd_count)
{
mtl_name=name;
sd_list=sd;
sd_count=count;
if(sd_count<=0)return;
ShaderDescriptorList sd_list_by_desc_type[VK_DESCRIPTOR_TYPE_RANGE_SIZE];
@ -105,8 +102,6 @@ MaterialDescriptorSets::~MaterialDescriptorSets()
if(dsl_ci[i].bindingCount)
delete[] dsl_ci[i].pBindings;
delete[] sd_list; //"delete[] nullptr" isn't bug.
//for(uint i=VK_DESCRIPTOR_TYPE_BEGIN_RANGE;
// i<=VK_DESCRIPTOR_TYPE_END_RANGE;i++)
//{

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

@ -177,6 +177,8 @@ Material *RenderResource::CreateMaterial(const OSString &filename)
LoadShaderDescriptor(cbr,sd_list,count,ver);
mds=new MaterialDescriptorSets(mtl_name,sd_list,count);
delete[] sd_list;
}
}