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

deleted DescriptSetList/DescriptorBindingList.

Browse Source
This commit is contained in:
hyzboy 2021-06-15 17:46:38 +08:00
parent 0ad2c96645
commit e734acad00
3 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/hgl/graph/shader/ShaderResource.h
View File

@ -41,8 +41,6 @@ struct ShaderStage
};//struct ShaderStage };//struct ShaderStage
using ShaderStageList =ObjectList<ShaderStage>; using ShaderStageList =ObjectList<ShaderStage>;
using DescriptorSetList =List<uint32_t>;
using DescriptorBindingList =List<uint32_t>;
struct ShaderDescriptor struct ShaderDescriptor
{ {

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

@ -17,28 +17,6 @@ DescriptorSetLayoutCreater::~DescriptorSetLayoutCreater()
vkDestroyDescriptorSetLayout(device,dsl,nullptr); vkDestroyDescriptorSetLayout(device,dsl,nullptr);
} }
//单个版本，暂时用不到
//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) void DescriptorSetLayoutCreater::Bind(const ShaderDescriptorList *sd_list,VkDescriptorType desc_type,VkShaderStageFlagBits stageFlags)
{ {
if(!sd_list||sd_list->GetCount()<=0)return; if(!sd_list||sd_list->GetCount()<=0)return;
@ -55,6 +33,8 @@ void DescriptorSetLayoutCreater::Bind(const ShaderDescriptorList *sd_list,VkDesc
for(const ShaderDescriptor &sd:*sd_list) for(const ShaderDescriptor &sd:*sd_list)
{ {
//重复的绑定点是有可能存在的，比如CameraInfo在vs/fs中同时存在
if((!index_by_binding.KeyExist(sd.binding)) if((!index_by_binding.KeyExist(sd.binding))
&&(!index_by_binding_ri.KeyExist(sd.binding))) &&(!index_by_binding_ri.KeyExist(sd.binding)))
{ {

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

@ -26,13 +26,7 @@ public:
DescriptorSetLayoutCreater(VkDevice dev,VkDescriptorPool dp){device=dev;pool=dp;} DescriptorSetLayoutCreater(VkDevice dev,VkDescriptorPool dp){device=dev;pool=dp;}
~DescriptorSetLayoutCreater(); ~DescriptorSetLayoutCreater();
// void Bind(const uint32_t binding,VkDescriptorType,VkShaderStageFlagBits); //单个版本，暂时用不到
void Bind(const ShaderDescriptorList *sd_list,VkDescriptorType type,VkShaderStageFlagBits stage); 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) void Bind(const ShaderDescriptorList *sdl,VkShaderStageFlagBits stage)
{ {