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

refactor ShaderDescriptorList.

Browse Source
This commit is contained in:
hyzboy
2021-06-15 17:43:06 +08:00
parent 983202966e
commit 0ad2c96645
5 changed files with 66 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/SceneGraph/Vulkan/VKDescriptorSetLayoutCreater.cpp
View File

@@ -17,30 +17,33 @@ DescriptorSetLayoutCreater::~DescriptorSetLayoutCreater()
vkDestroyDescriptorSetLayout(device,dsl,nullptr);
}
void DescriptorSetLayoutCreater::Bind(const uint32_t binding,VkDescriptorType desc_type,VkShaderStageFlagBits stageFlags)
//单个版本，暂时用不到
//void DescriptorSetLayoutCreater::Bind(const uint32_t binding,VkDescriptorType desc_type,VkShaderStageFlagBits stageFlags)
//{
// if(index_by_binding.KeyExist(binding))
// {
// //重复的绑定点，有可能存在的，比如CameraMatrix在vs/fs中同时存在
// return;
// }
//
// VkDescriptorSetLayoutBinding layout_binding;
//
// layout_binding.binding = binding;
// layout_binding.descriptorType = desc_type;
// layout_binding.descriptorCount = 1;
// layout_binding.stageFlags = stageFlags;
// layout_binding.pImmutableSamplers = nullptr;
//
// const int index=layout_binding_list.Add(layout_binding);
//
// index_by_binding.Add(binding,index);
//}
void DescriptorSetLayoutCreater::Bind(const ShaderDescriptorList *sd_list,VkDescriptorType desc_type,VkShaderStageFlagBits stageFlags)
{
if(index_by_binding.KeyExist(binding))
{
//重复的绑定点，有可能存在的，比如CameraMatrix在vs/fs中同时存在
return;
}
if(!sd_list||sd_list->GetCount()<=0)return;
VkDescriptorSetLayoutBinding layout_binding;
layout_binding.binding = binding;
layout_binding.descriptorType = desc_type;
layout_binding.descriptorCount = 1;
layout_binding.stageFlags = stageFlags;
layout_binding.pImmutableSamplers = nullptr;
const int index=layout_binding_list.Add(layout_binding);
index_by_binding.Add(binding,index);
}
void DescriptorSetLayoutCreater::Bind(const uint32_t *binding,const uint32_t binding_count,VkDescriptorType desc_type,VkShaderStageFlagBits stageFlags)
{
if(!binding||binding_count<=0)return;
const uint32_t binding_count=sd_list->GetCount();
const uint old_count=layout_binding_list.GetCount();
@@ -50,23 +53,22 @@ void DescriptorSetLayoutCreater::Bind(const uint32_t *binding,const uint32_t bin
uint fin_count=0;
for(uint i=old_count;i<old_count+binding_count;i++)
for(const ShaderDescriptor &sd:*sd_list)
{
if(!index_by_binding.KeyExist(*binding))
if((!index_by_binding.KeyExist(sd.binding))
&&(!index_by_binding_ri.KeyExist(sd.binding)))
{
p->binding = *binding;
p->binding = sd.binding;
p->descriptorType = desc_type;
p->descriptorCount = 1;
p->stageFlags = stageFlags;
p->pImmutableSamplers = nullptr;
index_by_binding.Add(*binding,i);
index_by_binding.Add(sd.binding,fin_count+old_count);
++p;
++fin_count;
}
++binding;
}
layout_binding_list.SetCount(old_count+fin_count);

19
src/SceneGraph/Vulkan/VKDescriptorSetLayoutCreater.h
View File

@@ -17,6 +17,7 @@ class DescriptorSetLayoutCreater
List<VkDescriptorSetLayoutBinding> layout_binding_list;
VkDescriptorSetLayout dsl=VK_NULL_HANDLE;
BindingMapping index_by_binding;
BindingMapping index_by_binding_ri;
VkPipelineLayout pipeline_layout=VK_NULL_HANDLE;
@@ -25,20 +26,20 @@ public:
DescriptorSetLayoutCreater(VkDevice dev,VkDescriptorPool dp){device=dev;pool=dp;}
~DescriptorSetLayoutCreater();
void Bind(const uint32_t binding,VkDescriptorType,VkShaderStageFlagBits);
void Bind(const uint32_t *binding,const uint32_t count,VkDescriptorType type,VkShaderStageFlagBits stage);
void Bind(const DescriptorBindingList &dbl,VkDescriptorType type,VkShaderStageFlagBits stage)
{
if(dbl.GetCount()>0)
Bind(dbl.GetData(),dbl.GetCount(),type,stage);
}
// void Bind(const uint32_t binding,VkDescriptorType,VkShaderStageFlagBits); //单个版本，暂时用不到
void Bind(const ShaderDescriptorList *sd_list,VkDescriptorType type,VkShaderStageFlagBits stage);
//void Bind(const DescriptorBindingList &dbl,VkDescriptorType type,VkShaderStageFlagBits stage)
//{
// if(dbl.GetCount()>0)
// Bind(dbl.GetData(),dbl.GetCount(),type,stage);
//}
void Bind(const ShaderDescriptorList *sdl,VkShaderStageFlagBits stage)
{
for(uint32_t i=VK_DESCRIPTOR_TYPE_BEGIN_RANGE;i<=VK_DESCRIPTOR_TYPE_END_RANGE;i++)
{
if(sdl->binding_list.GetCount()>0)
Bind(sdl->binding_list.GetData(),sdl->binding_list.GetCount(),(VkDescriptorType)i,stage);
if(sdl->GetCount()>0)
Bind(sdl,(VkDescriptorType)i,stage);
++sdl;
}