From 70715e93e85eecc20749e1d12955b6d779cc27e3 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Mon, 30 Nov 2020 17:41:11 +0800 Subject: [PATCH] removed BindUBODynamic function in VKDescriptorSets --- inc/hgl/graph/VKDescriptorSets.h | 1 - src/SceneGraph/Vulkan/VKDescriptorSets.cpp | 22 ++++++++-------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/inc/hgl/graph/VKDescriptorSets.h b/inc/hgl/graph/VKDescriptorSets.h index 7d986790..eeeaecef 100644 --- a/inc/hgl/graph/VKDescriptorSets.h +++ b/inc/hgl/graph/VKDescriptorSets.h @@ -42,7 +42,6 @@ public: void Clear(); bool BindUBO(const int binding,const GPUBuffer *); 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 BindInputAttachment(const int binding,Texture *); void Update(); diff --git a/src/SceneGraph/Vulkan/VKDescriptorSets.cpp b/src/SceneGraph/Vulkan/VKDescriptorSets.cpp index 1fc77066..fb0a00d1 100644 --- a/src/SceneGraph/Vulkan/VKDescriptorSets.cpp +++ b/src/SceneGraph/Vulkan/VKDescriptorSets.cpp @@ -20,8 +20,10 @@ namespace 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; pBufferInfo = buf_info; pTexelBufferView = nullptr; @@ -72,7 +74,8 @@ bool DescriptorSets::BindUBO(const int binding,const GPUBuffer *buf) if(binding<0||!buf) return(false); - wds_list.Add(WriteDescriptorSet(desc_set,binding,buf->GetBufferInfo())); + wds_list.Add(WriteDescriptorSet(desc_set,binding,buf->GetBufferInfo(),buf->IsDynamic())); + return(true); } @@ -84,17 +87,8 @@ bool DescriptorSets::BindUBO(const int binding,const GPUBuffer *buf,const VkDevi DescriptorBufferInfo *buf_info=new DescriptorBufferInfo(buf,offset,range); buffer_list.Add(buf_info); - - wds_list.Add(WriteDescriptorSet(desc_set,binding,buf_info)); - 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)); + + wds_list.Add(WriteDescriptorSet(desc_set,binding,buf_info,buf->IsDynamic())); return(true); }