From 8b4974426523e356ef4fae9088ca157092e80d06 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Fri, 6 Nov 2015 06:42:02 +0800 Subject: bug 15085: queue creation naming issues Manually rename arraySize and s/queuePriorityCount/queueCount/g s/requestedQueueCount/queueCreateInfoCount/g s/pRequestedQueues/pQueueCreateInfos/g https://cvs.khronos.org/bugzilla/show_bug.cgi?id=15085 Conflicts: layers/draw_state.cpp --- include/vulkan/vulkan.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/vulkan') diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index 4eb7e96a..792d02ae 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -1340,7 +1340,7 @@ typedef struct VkDeviceQueueCreateInfo { const void* pNext; VkDeviceQueueCreateFlags flags; uint32_t queueFamilyIndex; - uint32_t queuePriorityCount; + uint32_t queueCount; const float* pQueuePriorities; } VkDeviceQueueCreateInfo; @@ -1348,8 +1348,8 @@ typedef struct VkDeviceCreateInfo { VkStructureType sType; const void* pNext; VkDeviceCreateFlags flags; - uint32_t requestedQueueCount; - const VkDeviceQueueCreateInfo* pRequestedQueues; + uint32_t queueCreateInfoCount; + const VkDeviceQueueCreateInfo* pQueueCreateInfos; uint32_t enabledLayerNameCount; const char*const* ppEnabledLayerNames; uint32_t enabledExtensionNameCount; @@ -1841,7 +1841,7 @@ typedef struct VkSamplerCreateInfo { typedef struct VkDescriptorSetLayoutBinding { uint32_t binding; VkDescriptorType descriptorType; - uint32_t arraySize; + uint32_t descriptorCount; VkShaderStageFlags stageFlags; const VkSampler* pImmutableSamplers; } VkDescriptorSetLayoutBinding; -- cgit v1.2.3