commit 045654f003fa47a4a15cba6709222c75b5e72e41
author Chia-I Wu <olv@lunarg.com> Fri Nov 06 06:42:02 2015 +0800
committer Jon Ashburn <jon@lunarg.com> Fri Nov 06 15:34:07 2015 -0700
tree 03b53c208890680200aec24a40ebf788bafb1ef2
parent ee0eaa1efc64c22968945a7b4bb27535fa04a510

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

demos/cube.c

diff --git a/demos/cube.c b/demos/cube.c
index 25ca9b2..9cb5666 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -1301,14 +1301,14 @@
         [0] = {
             .binding = 0,
             .descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
-            .arraySize = 1,
+            .descriptorCount = 1,
             .stageFlags = VK_SHADER_STAGE_VERTEX_BIT,
             .pImmutableSamplers = NULL,
         },
         [1] = {
             .binding = 1,
             .descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
-            .arraySize = DEMO_TEXTURE_COUNT,
+            .descriptorCount = DEMO_TEXTURE_COUNT,
             .stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT,
             .pImmutableSamplers = NULL,
         },
@@ -2352,15 +2352,15 @@
         .sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO,
         .pNext = NULL,
         .queueFamilyIndex = gfx_queue_idx,
-        .queuePriorityCount = 1,
+        .queueCount = 1,
         .pQueuePriorities = queue_priorities
     };
 
     VkDeviceCreateInfo device = {
         .sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO,
         .pNext = NULL,
-        .requestedQueueCount = 1,
-        .pRequestedQueues = &queue,
+        .queueCreateInfoCount = 1,
+        .pQueueCreateInfos = &queue,
         .enabledLayerNameCount = enabled_layer_count,
         .ppEnabledLayerNames = (const char *const*) ((demo->validate) ? device_validation_layers : NULL),
         .enabledExtensionNameCount = enabled_extension_count,

demos/tri.c

diff --git a/demos/tri.c b/demos/tri.c
index 201c973..f51f937 100644
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -1061,7 +1061,7 @@
     const VkDescriptorSetLayoutBinding layout_binding = {
         .binding = 0,
         .descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
-        .arraySize = DEMO_TEXTURE_COUNT,
+        .descriptorCount = DEMO_TEXTURE_COUNT,
         .stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT,
         .pImmutableSamplers = NULL,
     };
@@ -1791,7 +1791,7 @@
         .sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO,
         .pNext = NULL,
         .queueFamilyIndex = 0,
-        .queuePriorityCount = 1,
+        .queueCount = 1,
         .pQueuePriorities = queue_priorities
     };
     uint32_t gpu_count;
@@ -1886,8 +1886,8 @@
     VkDeviceCreateInfo device = {
         .sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO,
         .pNext = NULL,
-        .requestedQueueCount = 1,
-        .pRequestedQueues = &queue,
+        .queueCreateInfoCount = 1,
+        .pQueueCreateInfos = &queue,
         .enabledLayerNameCount = enabled_layer_count,
         .ppEnabledLayerNames = (const char *const*) ((demo->validate) ? device_validation_layers : NULL),
         .enabledExtensionNameCount = enabled_extension_count,

demos/vulkaninfo.c

diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c
index 640ccab..995c1bd 100644
--- a/demos/vulkaninfo.c
+++ b/demos/vulkaninfo.c
@@ -391,8 +391,8 @@
     VkDeviceCreateInfo info = {
         .sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO,
         .pNext = NULL,
-        .requestedQueueCount = 0,
-        .pRequestedQueues = NULL,
+        .queueCreateInfoCount = 0,
+        .pQueueCreateInfos = NULL,
         .enabledLayerNameCount = 0,
         .ppEnabledLayerNames = NULL,
         .enabledExtensionNameCount = 0,
@@ -475,8 +475,8 @@
     }
 
     /* request all queues */
-    info.requestedQueueCount = gpu->queue_count;
-    info.pRequestedQueues = gpu->queue_reqs;
+    info.queueCreateInfoCount = gpu->queue_count;
+    info.pQueueCreateInfos = gpu->queue_reqs;
 
     info.enabledLayerNameCount = 0;
     info.ppEnabledLayerNames = NULL;
@@ -662,7 +662,7 @@
         gpu->queue_reqs[i].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
         gpu->queue_reqs[i].pNext = NULL;
         gpu->queue_reqs[i].queueFamilyIndex = i;
-        gpu->queue_reqs[i].queuePriorityCount = gpu->queue_props[i].queueCount;
+        gpu->queue_reqs[i].queueCount = gpu->queue_props[i].queueCount;
         gpu->queue_reqs[i].pQueuePriorities = queue_priorities;
     }