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
diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index 4eb7e96..792d02a 100644
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -1340,7 +1340,7 @@
const void* pNext;
VkDeviceQueueCreateFlags flags;
uint32_t queueFamilyIndex;
- uint32_t queuePriorityCount;
+ uint32_t queueCount;
const float* pQueuePriorities;
} VkDeviceQueueCreateInfo;
@@ -1348,8 +1348,8 @@
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 VkDescriptorSetLayoutBinding {
uint32_t binding;
VkDescriptorType descriptorType;
- uint32_t arraySize;
+ uint32_t descriptorCount;
VkShaderStageFlags stageFlags;
const VkSampler* pImmutableSamplers;
} VkDescriptorSetLayoutBinding;