From e398a85e659fba10f185af1d504002eb1ba075ae Mon Sep 17 00:00:00 2001 From: hyzboy Date: Mon, 30 Nov 2020 17:56:40 +0800 Subject: [PATCH] add BindingMapping instead Map --- inc/hgl/graph/VK.h | 4 +++- inc/hgl/graph/VKDescriptorSets.h | 4 ++-- src/SceneGraph/Vulkan/VKDescriptorSetLayoutCreater.h | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/inc/hgl/graph/VK.h b/inc/hgl/graph/VK.h index ce45b944..798c51ad 100644 --- a/inc/hgl/graph/VK.h +++ b/inc/hgl/graph/VK.h @@ -1,9 +1,10 @@ #ifndef HGL_GRAPH_VULKAN_INCLUDE #define HGL_GRAPH_VULKAN_INCLUDE -#include #include +#include #include +#include #include #include #include @@ -14,6 +15,7 @@ VK_NAMESPACE_BEGIN using CharPointerList=hgl::List; +using BindingMapping=Map; class VulkanInstance; class GPUPhysicalDevice; diff --git a/inc/hgl/graph/VKDescriptorSets.h b/inc/hgl/graph/VKDescriptorSets.h index eeeaecef..3cdfb100 100644 --- a/inc/hgl/graph/VKDescriptorSets.h +++ b/inc/hgl/graph/VKDescriptorSets.h @@ -11,7 +11,7 @@ class DescriptorSets VkDevice device; int count; VkDescriptorSet desc_set; - const Map *index_by_binding; + const BindingMapping *index_by_binding; VkPipelineLayout pipeline_layout; @@ -23,7 +23,7 @@ private: friend class DescriptorSetLayoutCreater; - DescriptorSets(VkDevice dev,const int c,VkPipelineLayout pl,VkDescriptorSet ds,const Map *bi):index_by_binding(bi) + DescriptorSets(VkDevice dev,const int c,VkPipelineLayout pl,VkDescriptorSet ds,const BindingMapping *bi):index_by_binding(bi) { device=dev; count=c; diff --git a/src/SceneGraph/Vulkan/VKDescriptorSetLayoutCreater.h b/src/SceneGraph/Vulkan/VKDescriptorSetLayoutCreater.h index c3ef1b00..fcf53ce6 100644 --- a/src/SceneGraph/Vulkan/VKDescriptorSetLayoutCreater.h +++ b/src/SceneGraph/Vulkan/VKDescriptorSetLayoutCreater.h @@ -1,5 +1,6 @@ #pragma once +#include #include #include VK_NAMESPACE_BEGIN @@ -15,7 +16,7 @@ class DescriptorSetLayoutCreater List layout_binding_list; VkDescriptorSetLayout dsl=VK_NULL_HANDLE; - Map index_by_binding; + BindingMapping index_by_binding; VkPipelineLayout pipeline_layout=VK_NULL_HANDLE;