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

removed BindUBODynamic function in VKDescriptorSets

Browse Source
This commit is contained in:
hyzboy 2020-11-30 17:41:11 +08:00
parent 626c0cd3bf
commit 70715e93e8
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
inc/hgl/graph/VKDescriptorSets.h
View File

@ -42,7 +42,6 @@ public:
void Clear(); void Clear();
bool BindUBO(const int binding,const GPUBuffer *); bool BindUBO(const int binding,const GPUBuffer *);
bool BindUBO(const int binding,const GPUBuffer *,const VkDeviceSize offset,const VkDeviceSize range); bool BindUBO(const int binding,const GPUBuffer *,const VkDeviceSize offset,const VkDeviceSize range);
bool BindUBODynamic(const int binding,const GPUBuffer *);
bool BindSampler(const int binding,Texture *,Sampler *); bool BindSampler(const int binding,Texture *,Sampler *);
bool BindInputAttachment(const int binding,Texture *); bool BindInputAttachment(const int binding,Texture *);
void Update(); void Update();

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

@ -20,7 +20,9 @@ namespace
descriptorType = desc_type; descriptorType = desc_type;
} }
WriteDescriptorSet(VkDescriptorSet desc_set,const uint32_t binding,const VkDescriptorBufferInfo *buf_info,const VkDescriptorType desc_type=VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER):WriteDescriptorSet(desc_set,binding,desc_type) WriteDescriptorSet(VkDescriptorSet desc_set,const uint32_t binding,const VkDescriptorBufferInfo *buf_info,const bool dynamic):
WriteDescriptorSet(desc_set,binding,dynamic?VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC:
VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER)
{ {
pImageInfo = nullptr; pImageInfo = nullptr;
pBufferInfo = buf_info; pBufferInfo = buf_info;
@ -72,7 +74,8 @@ bool DescriptorSets::BindUBO(const int binding,const GPUBuffer *buf)
if(binding<0||!buf) if(binding<0||!buf)
return(false); return(false);
wds_list.Add(WriteDescriptorSet(desc_set,binding,buf->GetBufferInfo())); wds_list.Add(WriteDescriptorSet(desc_set,binding,buf->GetBufferInfo(),buf->IsDynamic()));
return(true); return(true);
} }
@ -85,16 +88,7 @@ bool DescriptorSets::BindUBO(const int binding,const GPUBuffer *buf,const VkDevi
buffer_list.Add(buf_info); buffer_list.Add(buf_info);
wds_list.Add(WriteDescriptorSet(desc_set,binding,buf_info)); wds_list.Add(WriteDescriptorSet(desc_set,binding,buf_info,buf->IsDynamic()));
return(true);
}
bool DescriptorSets::BindUBODynamic(const int binding,const GPUBuffer *buf)
{
if(binding<0||!buf)
return(false);
wds_list.Add(WriteDescriptorSet(desc_set,binding,buf->GetBufferInfo(),VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC));
return(true); return(true);
} }