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

use DescriptorSetLayoutCreateInfo instead of ShaderDescriptorSet

Browse Source
This commit is contained in:
hyzboy
2021-09-14 21:11:01 +08:00
parent 99bfd4d257
commit 0a4ec8b184
6 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,7 +130,7 @@ bool RenderCmdBuffer::BindDescriptorSets(RenderableInstance *ri)
}
}
return(false);
return(true);
}
bool RenderCmdBuffer::BindVAB(RenderableInstance *ri)

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

@@ -19,7 +19,11 @@ MaterialDescriptorSets::MaterialDescriptorSets(ShaderDescriptor *sd,const uint c
if(sd_count<=0)return;
{
hgl_zero(sds,size_t(DescriptorSetType::RANGE_SIZE));
ENUM_CLASS_FOR(DescriptorSetType,int,i)
{
sds[i].bindingCount=0;
sds[i].pBindings=nullptr;
}
{
ShaderDescriptor *sp=sd_list;
@@ -33,7 +37,7 @@ MaterialDescriptorSets::MaterialDescriptorSets(ShaderDescriptor *sd,const uint c
sd_by_name.Add(sp->name,sp);
binding_map[size_t(sp->desc_type)].Add(sp->name,sp->binding);
++sds[sp->set].count;
++sds[sp->set].bindingCount;
++sp;
}
@@ -43,10 +47,10 @@ MaterialDescriptorSets::MaterialDescriptorSets(ShaderDescriptor *sd,const uint c
{
ENUM_CLASS_FOR(DescriptorSetType,int,i)
if(sds[i].count>0)
if(sds[i].bindingCount>0)
{
sds[i].binding_list=new VkDescriptorSetLayoutBinding[sds[i].count];
sds_ptr[i]=sds[i].binding_list;
sds[i].pBindings=new VkDescriptorSetLayoutBinding[sds[i].bindingCount];
sds_ptr[i]=(VkDescriptorSetLayoutBinding *)sds[i].pBindings;
}
}
@@ -88,8 +92,8 @@ MaterialDescriptorSets::MaterialDescriptorSets(ShaderDescriptor *sd,const uint c
MaterialDescriptorSets::~MaterialDescriptorSets()
{
ENUM_CLASS_FOR(DescriptorSetType,int,i)
if(sds[i].count)
delete[] sds[i].binding_list;
if(sds[i].bindingCount)
delete[] sds[i].pBindings;
delete[] sd_list; //"delete[] nullptr" isn't bug.
}

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

@@ -10,26 +10,21 @@ PipelineLayoutData *GPUDevice::CreatePipelineLayoutData(const MaterialDescriptor
ENUM_CLASS_FOR(DescriptorSetType,int,i)
{
const int binding_count=mds->GetBindingCount((DescriptorSetType)i);
const DescriptorSetLayoutCreateInfo *dslci=mds->GetBinding((DescriptorSetType)i);
if(binding_count<=0)
if(!dslci)
continue;
DescriptorSetLayoutCreateInfo descriptor_layout;
descriptor_layout.bindingCount = binding_count;
descriptor_layout.pBindings = mds->GetBindingList((DescriptorSetType)i);
if(pld->layouts[i])
vkDestroyDescriptorSetLayout(attr->device,pld->layouts[i],nullptr);
if(vkCreateDescriptorSetLayout(attr->device,&descriptor_layout,nullptr,pld->layouts+i)!=VK_SUCCESS)
if(vkCreateDescriptorSetLayout(attr->device,dslci,nullptr,pld->layouts+i)!=VK_SUCCESS)
{
delete pld;
return(nullptr);
}
pld->binding_count[i]=binding_count;
pld->binding_count[i]=dslci->bindingCount;
pld->fin_dsl[pld->fin_dsl_count]=pld->layouts[i];
++pld->fin_dsl_count;