From 2749b846b4e5d08db2210d7d8e269b8a92ed286a Mon Sep 17 00:00:00 2001 From: saschawillems Date: Mon, 15 Aug 2016 15:13:33 +0200 Subject: [PATCH] Optional descriptor count parameter for descriptor set layout binding initializer --- base/vulkantools.cpp | 6 +++--- base/vulkantools.h | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/base/vulkantools.cpp b/base/vulkantools.cpp index 63091131..9c641a20 100644 --- a/base/vulkantools.cpp +++ b/base/vulkantools.cpp @@ -630,14 +630,14 @@ VkDescriptorPoolSize vkTools::initializers::descriptorPoolSize( VkDescriptorSetLayoutBinding vkTools::initializers::descriptorSetLayoutBinding( VkDescriptorType type, VkShaderStageFlags stageFlags, - uint32_t binding) + uint32_t binding, + uint32_t count) { VkDescriptorSetLayoutBinding setLayoutBinding = {}; setLayoutBinding.descriptorType = type; setLayoutBinding.stageFlags = stageFlags; setLayoutBinding.binding = binding; - // Default value in all examples - setLayoutBinding.descriptorCount = 1; + setLayoutBinding.descriptorCount = count; return setLayoutBinding; } diff --git a/base/vulkantools.h b/base/vulkantools.h index 0506488c..1bd02c41 100644 --- a/base/vulkantools.h +++ b/base/vulkantools.h @@ -180,7 +180,8 @@ namespace vkTools VkDescriptorSetLayoutBinding descriptorSetLayoutBinding( VkDescriptorType type, VkShaderStageFlags stageFlags, - uint32_t binding); + uint32_t binding, + uint32_t count = 1); VkDescriptorSetLayoutCreateInfo descriptorSetLayoutCreateInfo( const VkDescriptorSetLayoutBinding* pBindings,