bug 14892: 'count' parameters and members named inconsistently in many cases (WIP)
s/waitSemCount/waitSemaphoreCount/g
s/signalSemCount/signalSemaphoreCount/g
s/cmdBufferCount/commandBufferCount/g
s/queueFamilyCount/queueFamilyIndexCount/g
s/layerCount/enabledLayerNameCount/g
s/extensionCount/enabledExtensionNameCount/g
https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14892
diff --git a/tests/image_tests.cpp b/tests/image_tests.cpp
index 6fd07b4..37b72e2 100644
--- a/tests/image_tests.cpp
+++ b/tests/image_tests.cpp
@@ -98,9 +98,9 @@
inst_info.pNext = NULL;
inst_info.pAppInfo = &app_info;
inst_info.pAllocCb = NULL;
- inst_info.layerCount = 0;
+ inst_info.enabledLayerNameCount = 0;
inst_info.ppEnabledLayerNames = NULL;
- inst_info.extensionCount = 0;
+ inst_info.enabledExtensionNameCount = 0;
inst_info.ppEnabledExtensionNames = NULL;
err = vkCreateInstance(&inst_info, &this->inst);
ASSERT_VK_SUCCESS(err);
diff --git a/tests/init.cpp b/tests/init.cpp
index 804efdd..0eb32f1 100644
--- a/tests/init.cpp
+++ b/tests/init.cpp
@@ -104,9 +104,9 @@
inst_info.pNext = NULL;
inst_info.pAppInfo = &app_info;
inst_info.pAllocCb = NULL;
- inst_info.layerCount = 0;
+ inst_info.enabledLayerNameCount = 0;
inst_info.ppEnabledLayerNames = NULL;
- inst_info.extensionCount = 0;
+ inst_info.enabledExtensionNameCount = 0;
inst_info.ppEnabledExtensionNames = NULL;
err = vkCreateInstance(&inst_info, &inst);
ASSERT_VK_SUCCESS(err);
@@ -507,7 +507,7 @@
info.sType = VK_STRUCTURE_TYPE_CMD_BUFFER_ALLOC_INFO;
info.cmdPool = cmdPool;
- info.count = 1;
+ info.bufferCount = 1;
info.level = VK_CMD_BUFFER_LEVEL_PRIMARY;
err = vkAllocCommandBuffers(device(), &info, &cmdBuffer);
ASSERT_VK_SUCCESS(err) << "vkAllocCommandBuffers failed";
diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index dd929ce..f6fb2ab 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -416,11 +416,11 @@
VkSubmitInfo submit_info;
submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
submit_info.pNext = NULL;
- submit_info.waitSemCount = 0;
+ submit_info.waitSemaphoreCount = 0;
submit_info.pWaitSemaphores = NULL;
- submit_info.cmdBufferCount = 1;
+ submit_info.commandBufferCount = 1;
submit_info.pCommandBuffers = &m_cmdBuffer->handle();
- submit_info.signalSemCount = 0;
+ submit_info.signalSemaphoreCount = 0;
submit_info.pSignalSemaphores = NULL;
err = vkQueueSubmit( m_device->m_queue, 1, &submit_info, testFence.handle());
@@ -463,11 +463,11 @@
VkSubmitInfo submit_info;
submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
submit_info.pNext = NULL;
- submit_info.waitSemCount = 0;
+ submit_info.waitSemaphoreCount = 0;
submit_info.pWaitSemaphores = NULL;
- submit_info.cmdBufferCount = 1;
+ submit_info.commandBufferCount = 1;
submit_info.pCommandBuffers = &m_cmdBuffer->handle();
- submit_info.signalSemCount = 0;
+ submit_info.signalSemaphoreCount = 0;
submit_info.pSignalSemaphores = NULL;
err = vkQueueSubmit( m_device->m_queue, 1, &submit_info, testFence.handle());
@@ -743,11 +743,11 @@
VkSubmitInfo submit_info;
submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
submit_info.pNext = NULL;
- submit_info.waitSemCount = 0;
+ submit_info.waitSemaphoreCount = 0;
submit_info.pWaitSemaphores = NULL;
- submit_info.cmdBufferCount = 1;
+ submit_info.commandBufferCount = 1;
submit_info.pCommandBuffers = &m_cmdBuffer->handle();
- submit_info.signalSemCount = 0;
+ submit_info.signalSemaphoreCount = 0;
submit_info.pSignalSemaphores = NULL;
vkQueueSubmit(m_device->m_queue, 1, &submit_info, testFence.handle());
@@ -850,14 +850,14 @@
VkDescriptorTypeCount ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
- ds_type_count.count = 1;
+ ds_type_count.descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.count = 1;
- ds_pool_ci.pTypeCount = &ds_type_count;
+ ds_pool_ci.typeCount = 1;
+ ds_pool_ci.pTypeCounts = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, &ds_pool);
@@ -872,8 +872,8 @@
VkDescriptorSetLayoutCreateInfo ds_layout_ci = {};
ds_layout_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
ds_layout_ci.pNext = NULL;
- ds_layout_ci.count = 1;
- ds_layout_ci.pBinding = &dsl_binding;
+ ds_layout_ci.bindingCount = 1;
+ ds_layout_ci.pBindings = &dsl_binding;
VkDescriptorSetLayout ds_layout;
err = vkCreateDescriptorSetLayout(m_device->device(), &ds_layout_ci, &ds_layout);
@@ -882,7 +882,7 @@
VkDescriptorSet descriptorSet;
VkDescriptorSetAllocInfo alloc_info = {};
alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO;
- alloc_info.count = 1;
+ alloc_info.setLayoutCount = 1;
alloc_info.descriptorPool = ds_pool;
alloc_info.pSetLayouts = &ds_layout;
err = vkAllocDescriptorSets(m_device->device(), &alloc_info, &descriptorSet);
@@ -891,7 +891,7 @@
VkPipelineLayoutCreateInfo pipeline_layout_ci = {};
pipeline_layout_ci.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
pipeline_layout_ci.pNext = NULL;
- pipeline_layout_ci.descriptorSetCount = 1;
+ pipeline_layout_ci.setLayoutCount = 1;
pipeline_layout_ci.pSetLayouts = &ds_layout;
VkPipelineLayout pipeline_layout;
@@ -1071,14 +1071,14 @@
m_errorMonitor->ClearState();
VkDescriptorTypeCount ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER;
- ds_type_count.count = 1;
+ ds_type_count.descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.count = 1;
- ds_pool_ci.pTypeCount = &ds_type_count;
+ ds_pool_ci.typeCount = 1;
+ ds_pool_ci.pTypeCounts = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, &ds_pool);
@@ -1093,8 +1093,8 @@
VkDescriptorSetLayoutCreateInfo ds_layout_ci = {};
ds_layout_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
ds_layout_ci.pNext = NULL;
- ds_layout_ci.count = 1;
- ds_layout_ci.pBinding = &dsl_binding;
+ ds_layout_ci.bindingCount = 1;
+ ds_layout_ci.pBindings = &dsl_binding;
VkDescriptorSetLayout ds_layout;
err = vkCreateDescriptorSetLayout(m_device->device(), &ds_layout_ci, &ds_layout);
ASSERT_VK_SUCCESS(err);
@@ -1102,7 +1102,7 @@
VkDescriptorSet descriptorSet;
VkDescriptorSetAllocInfo alloc_info = {};
alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO;
- alloc_info.count = 1;
+ alloc_info.setLayoutCount = 1;
alloc_info.descriptorPool = ds_pool;
alloc_info.pSetLayouts = &ds_layout;
err = vkAllocDescriptorSets(m_device->device(), &alloc_info, &descriptorSet);
@@ -1115,7 +1115,7 @@
descriptor_write.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
descriptor_write.destSet = descriptorSet;
descriptor_write.destBinding = 0;
- descriptor_write.count = 1;
+ descriptor_write.descriptorCount = 1;
descriptor_write.descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER;
descriptor_write.pTexelBufferView = &view;
@@ -1310,11 +1310,11 @@
VkSubmitInfo submit_info;
submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
submit_info.pNext = NULL;
- submit_info.waitSemCount = 0;
+ submit_info.waitSemaphoreCount = 0;
submit_info.pWaitSemaphores = NULL;
- submit_info.cmdBufferCount = 1;
+ submit_info.commandBufferCount = 1;
submit_info.pCommandBuffers = &m_cmdBuffer->handle();
- submit_info.signalSemCount = 0;
+ submit_info.signalSemaphoreCount = 0;
submit_info.pSignalSemaphores = NULL;
err = vkQueueSubmit( m_device->m_queue, 1, &submit_info, testFence.handle());
@@ -1344,14 +1344,14 @@
VkDescriptorTypeCount ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
- ds_type_count.count = 1;
+ ds_type_count.descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.count = 1;
- ds_pool_ci.pTypeCount = &ds_type_count;
+ ds_pool_ci.typeCount = 1;
+ ds_pool_ci.pTypeCounts = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, &ds_pool);
@@ -1366,8 +1366,8 @@
VkDescriptorSetLayoutCreateInfo ds_layout_ci = {};
ds_layout_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
ds_layout_ci.pNext = NULL;
- ds_layout_ci.count = 1;
- ds_layout_ci.pBinding = &dsl_binding;
+ ds_layout_ci.bindingCount = 1;
+ ds_layout_ci.pBindings = &dsl_binding;
VkDescriptorSetLayout ds_layout;
err = vkCreateDescriptorSetLayout(m_device->device(), &ds_layout_ci, &ds_layout);
@@ -1376,7 +1376,7 @@
VkDescriptorSet descriptorSet;
VkDescriptorSetAllocInfo alloc_info = {};
alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO;
- alloc_info.count = 1;
+ alloc_info.setLayoutCount = 1;
alloc_info.descriptorPool = ds_pool;
alloc_info.pSetLayouts = &ds_layout;
err = vkAllocDescriptorSets(m_device->device(), &alloc_info, &descriptorSet);
@@ -1392,7 +1392,7 @@
VkPipelineLayoutCreateInfo pipeline_layout_ci = {};
pipeline_layout_ci.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
pipeline_layout_ci.pNext = NULL;
- pipeline_layout_ci.descriptorSetCount = 1;
+ pipeline_layout_ci.setLayoutCount = 1;
pipeline_layout_ci.pSetLayouts = &ds_layout;
VkPipelineLayout pipeline_layout;
@@ -1443,15 +1443,15 @@
// Create Pool w/ 1 Sampler descriptor, but try to alloc Uniform Buffer descriptor from it
VkDescriptorTypeCount ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_SAMPLER;
- ds_type_count.count = 1;
+ ds_type_count.descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.flags = 0;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.count = 1;
- ds_pool_ci.pTypeCount = &ds_type_count;
+ ds_pool_ci.typeCount = 1;
+ ds_pool_ci.pTypeCounts = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, &ds_pool);
@@ -1466,8 +1466,8 @@
VkDescriptorSetLayoutCreateInfo ds_layout_ci = {};
ds_layout_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
ds_layout_ci.pNext = NULL;
- ds_layout_ci.count = 1;
- ds_layout_ci.pBinding = &dsl_binding;
+ ds_layout_ci.bindingCount = 1;
+ ds_layout_ci.pBindings = &dsl_binding;
VkDescriptorSetLayout ds_layout;
err = vkCreateDescriptorSetLayout(m_device->device(), &ds_layout_ci, &ds_layout);
@@ -1476,7 +1476,7 @@
VkDescriptorSet descriptorSet;
VkDescriptorSetAllocInfo alloc_info = {};
alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO;
- alloc_info.count = 1;
+ alloc_info.setLayoutCount = 1;
alloc_info.descriptorPool = ds_pool;
alloc_info.pSetLayouts = &ds_layout;
err = vkAllocDescriptorSets(m_device->device(), &alloc_info, &descriptorSet);
@@ -1503,17 +1503,17 @@
VkDescriptorTypeCount ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
- ds_type_count.count = 1;
+ ds_type_count.descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.count = 1;
+ ds_pool_ci.typeCount = 1;
ds_pool_ci.flags = 0;
// Not specifying VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT means
// app can only call vkResetDescriptorPool on this pool.;
- ds_pool_ci.pTypeCount = &ds_type_count;
+ ds_pool_ci.pTypeCounts = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, &ds_pool);
@@ -1528,8 +1528,8 @@
VkDescriptorSetLayoutCreateInfo ds_layout_ci = {};
ds_layout_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
ds_layout_ci.pNext = NULL;
- ds_layout_ci.count = 1;
- ds_layout_ci.pBinding = &dsl_binding;
+ ds_layout_ci.bindingCount = 1;
+ ds_layout_ci.pBindings = &dsl_binding;
VkDescriptorSetLayout ds_layout;
err = vkCreateDescriptorSetLayout(m_device->device(), &ds_layout_ci, &ds_layout);
@@ -1538,7 +1538,7 @@
VkDescriptorSet descriptorSet;
VkDescriptorSetAllocInfo alloc_info = {};
alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO;
- alloc_info.count = 1;
+ alloc_info.setLayoutCount = 1;
alloc_info.descriptorPool = ds_pool;
alloc_info.pSetLayouts = &ds_layout;
err = vkAllocDescriptorSets(m_device->device(), &alloc_info, &descriptorSet);
@@ -1622,14 +1622,14 @@
m_errorMonitor->ClearState();
VkDescriptorTypeCount ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
- ds_type_count.count = 1;
+ ds_type_count.descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.count = 1;
- ds_pool_ci.pTypeCount = &ds_type_count;
+ ds_pool_ci.typeCount = 1;
+ ds_pool_ci.pTypeCounts = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, &ds_pool);
@@ -1644,8 +1644,8 @@
VkDescriptorSetLayoutCreateInfo ds_layout_ci = {};
ds_layout_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
ds_layout_ci.pNext = NULL;
- ds_layout_ci.count = 1;
- ds_layout_ci.pBinding = &dsl_binding;
+ ds_layout_ci.bindingCount = 1;
+ ds_layout_ci.pBindings = &dsl_binding;
VkDescriptorSetLayout ds_layout;
err = vkCreateDescriptorSetLayout(m_device->device(), &ds_layout_ci, &ds_layout);
ASSERT_VK_SUCCESS(err);
@@ -1653,7 +1653,7 @@
VkDescriptorSet descriptorSet;
VkDescriptorSetAllocInfo alloc_info = {};
alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO;
- alloc_info.count = 1;
+ alloc_info.setLayoutCount = 1;
alloc_info.descriptorPool = ds_pool;
alloc_info.pSetLayouts = &ds_layout;
err = vkAllocDescriptorSets(m_device->device(), &alloc_info, &descriptorSet);
@@ -1662,7 +1662,7 @@
VkPipelineLayoutCreateInfo pipeline_layout_ci = {};
pipeline_layout_ci.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
pipeline_layout_ci.pNext = NULL;
- pipeline_layout_ci.descriptorSetCount = 1;
+ pipeline_layout_ci.setLayoutCount = 1;
pipeline_layout_ci.pSetLayouts = &ds_layout;
VkPipelineLayout pipeline_layout;
@@ -1755,7 +1755,7 @@
cmd.pNext = NULL;
cmd.cmdPool = m_cmdPool;
cmd.level = VK_CMD_BUFFER_LEVEL_SECONDARY;
- cmd.count = 1;
+ cmd.bufferCount = 1;
err = vkAllocCommandBuffers(m_device->device(), &cmd, &draw_cmd);
ASSERT_VK_SUCCESS(err);
@@ -1790,14 +1790,14 @@
VkDescriptorTypeCount ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
- ds_type_count.count = 1;
+ ds_type_count.descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.count = 1;
- ds_pool_ci.pTypeCount = &ds_type_count;
+ ds_pool_ci.typeCount = 1;
+ ds_pool_ci.pTypeCounts = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, &ds_pool);
@@ -1812,8 +1812,8 @@
VkDescriptorSetLayoutCreateInfo ds_layout_ci = {};
ds_layout_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
ds_layout_ci.pNext = NULL;
- ds_layout_ci.count = 1;
- ds_layout_ci.pBinding = &dsl_binding;
+ ds_layout_ci.bindingCount = 1;
+ ds_layout_ci.pBindings = &dsl_binding;
VkDescriptorSetLayout ds_layout;
err = vkCreateDescriptorSetLayout(m_device->device(), &ds_layout_ci, &ds_layout);
@@ -1822,7 +1822,7 @@
VkDescriptorSet descriptorSet;
VkDescriptorSetAllocInfo alloc_info = {};
alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO;
- alloc_info.count = 1;
+ alloc_info.setLayoutCount = 1;
alloc_info.descriptorPool = ds_pool;
alloc_info.pSetLayouts = &ds_layout;
err = vkAllocDescriptorSets(m_device->device(), &alloc_info, &descriptorSet);
@@ -1830,7 +1830,7 @@
VkPipelineLayoutCreateInfo pipeline_layout_ci = {};
pipeline_layout_ci.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
- pipeline_layout_ci.descriptorSetCount = 1;
+ pipeline_layout_ci.setLayoutCount = 1;
pipeline_layout_ci.pSetLayouts = &ds_layout;
VkPipelineLayout pipeline_layout;
@@ -1892,13 +1892,13 @@
VkDescriptorTypeCount ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
- ds_type_count.count = 1;
+ ds_type_count.descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
- ds_pool_ci.count = 1;
- ds_pool_ci.pTypeCount = &ds_type_count;
+ ds_pool_ci.typeCount = 1;
+ ds_pool_ci.pTypeCounts = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), VK_DESCRIPTOR_POOL_USAGE_NON_FREE, 1, &ds_pool_ci, &ds_pool);
@@ -1913,8 +1913,8 @@
VkDescriptorSetLayoutCreateInfo ds_layout_ci = {};
ds_layout_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
ds_layout_ci.pNext = NULL;
- ds_layout_ci.count = 1;
- ds_layout_ci.pBinding = &dsl_binding;
+ ds_layout_ci.bindingCount = 1;
+ ds_layout_ci.pBindings = &dsl_binding;
VkDescriptorSetLayout ds_layout;
err = vkCreateDescriptorSetLayout(m_device->device(), &ds_layout_ci, &ds_layout);
@@ -1927,7 +1927,7 @@
VkPipelineLayoutCreateInfo pipeline_layout_ci = {};
pipeline_layout_ci.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
pipeline_layout_ci.pNext = NULL;
- pipeline_layout_ci.descriptorSetCount = 1;
+ pipeline_layout_ci.setLayoutCount = 1;
pipeline_layout_ci.pSetLayouts = &ds_layout;
VkPipelineLayout pipeline_layout;
@@ -2017,13 +2017,13 @@
VkDescriptorTypeCount ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
- ds_type_count.count = 1;
+ ds_type_count.descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.count = 1;
- ds_pool_ci.pTypeCount = &ds_type_count;
+ ds_pool_ci.typeCount = 1;
+ ds_pool_ci.pTypeCounts = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, &ds_pool);
@@ -2036,8 +2036,8 @@
VkDescriptorSetLayoutCreateInfo ds_layout_ci = {};
ds_layout_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
- ds_layout_ci.count = 1;
- ds_layout_ci.pBinding = &dsl_binding;
+ ds_layout_ci.bindingCount = 1;
+ ds_layout_ci.pBindings = &dsl_binding;
VkDescriptorSetLayout ds_layout;
err = vkCreateDescriptorSetLayout(m_device->device(), &ds_layout_ci, &ds_layout);
@@ -2046,7 +2046,7 @@
VkDescriptorSet descriptorSet;
VkDescriptorSetAllocInfo alloc_info = {};
alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO;
- alloc_info.count = 1;
+ alloc_info.setLayoutCount = 1;
alloc_info.descriptorPool = ds_pool;
alloc_info.pSetLayouts = &ds_layout;
err = vkAllocDescriptorSets(m_device->device(), &alloc_info, &descriptorSet);
@@ -2054,7 +2054,7 @@
VkPipelineLayoutCreateInfo pipeline_layout_ci = {};
pipeline_layout_ci.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
- pipeline_layout_ci.descriptorSetCount = 1;
+ pipeline_layout_ci.setLayoutCount = 1;
pipeline_layout_ci.pSetLayouts = &ds_layout;
VkPipelineLayout pipeline_layout;
@@ -2126,13 +2126,13 @@
VkDescriptorTypeCount ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
- ds_type_count.count = 1;
+ ds_type_count.descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.count = 1;
- ds_pool_ci.pTypeCount = &ds_type_count;
+ ds_pool_ci.typeCount = 1;
+ ds_pool_ci.pTypeCounts = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, &ds_pool);
@@ -2145,8 +2145,8 @@
VkDescriptorSetLayoutCreateInfo ds_layout_ci = {};
ds_layout_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
- ds_layout_ci.count = 1;
- ds_layout_ci.pBinding = &dsl_binding;
+ ds_layout_ci.bindingCount = 1;
+ ds_layout_ci.pBindings = &dsl_binding;
VkDescriptorSetLayout ds_layout;
err = vkCreateDescriptorSetLayout(m_device->device(), &ds_layout_ci, &ds_layout);
@@ -2155,7 +2155,7 @@
VkDescriptorSet descriptorSet;
VkDescriptorSetAllocInfo alloc_info = {};
alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO;
- alloc_info.count = 1;
+ alloc_info.setLayoutCount = 1;
alloc_info.descriptorPool = ds_pool;
alloc_info.pSetLayouts = &ds_layout;
err = vkAllocDescriptorSets(m_device->device(), &alloc_info, &descriptorSet);
@@ -2163,7 +2163,7 @@
VkPipelineLayoutCreateInfo pipeline_layout_ci = {};
pipeline_layout_ci.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
- pipeline_layout_ci.descriptorSetCount = 1;
+ pipeline_layout_ci.setLayoutCount = 1;
pipeline_layout_ci.pSetLayouts = &ds_layout;
VkPipelineLayout pipeline_layout;
@@ -2234,13 +2234,13 @@
VkDescriptorTypeCount ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
- ds_type_count.count = 1;
+ ds_type_count.descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.count = 1;
- ds_pool_ci.pTypeCount = &ds_type_count;
+ ds_pool_ci.typeCount = 1;
+ ds_pool_ci.pTypeCounts = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, &ds_pool);
@@ -2253,8 +2253,8 @@
VkDescriptorSetLayoutCreateInfo ds_layout_ci = {};
ds_layout_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
- ds_layout_ci.count = 1;
- ds_layout_ci.pBinding = &dsl_binding;
+ ds_layout_ci.bindingCount = 1;
+ ds_layout_ci.pBindings = &dsl_binding;
VkDescriptorSetLayout ds_layout;
err = vkCreateDescriptorSetLayout(m_device->device(), &ds_layout_ci, &ds_layout);
@@ -2263,7 +2263,7 @@
VkDescriptorSet descriptorSet;
VkDescriptorSetAllocInfo alloc_info = {};
alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO;
- alloc_info.count = 1;
+ alloc_info.setLayoutCount = 1;
alloc_info.descriptorPool = ds_pool;
alloc_info.pSetLayouts = &ds_layout;
err = vkAllocDescriptorSets(m_device->device(), &alloc_info, &descriptorSet);
@@ -2271,7 +2271,7 @@
VkPipelineLayoutCreateInfo pipeline_layout_ci = {};
pipeline_layout_ci.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
- pipeline_layout_ci.descriptorSetCount = 1;
+ pipeline_layout_ci.setLayoutCount = 1;
pipeline_layout_ci.pSetLayouts = &ds_layout;
VkPipelineLayout pipeline_layout;
@@ -2307,9 +2307,9 @@
VkPipelineVertexInputStateCreateInfo vi_ci = {};
vi_ci.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO;
vi_ci.pNext = nullptr;
- vi_ci.bindingCount = 0;
+ vi_ci.vertexBindingDescriptionCount = 0;
vi_ci.pVertexBindingDescriptions = nullptr;
- vi_ci.attributeCount = 0;
+ vi_ci.vertexAttributeDescriptionCount = 0;
vi_ci.pVertexAttributeDescriptions = nullptr;
VkPipelineInputAssemblyStateCreateInfo ia_ci = {};
@@ -2392,13 +2392,13 @@
VkDescriptorTypeCount ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
- ds_type_count.count = 1;
+ ds_type_count.descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.count = 1;
- ds_pool_ci.pTypeCount = &ds_type_count;
+ ds_pool_ci.typeCount = 1;
+ ds_pool_ci.pTypeCounts = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, &ds_pool);
@@ -2411,8 +2411,8 @@
VkDescriptorSetLayoutCreateInfo ds_layout_ci = {};
ds_layout_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
- ds_layout_ci.count = 1;
- ds_layout_ci.pBinding = &dsl_binding;
+ ds_layout_ci.bindingCount = 1;
+ ds_layout_ci.pBindings = &dsl_binding;
VkDescriptorSetLayout ds_layout;
err = vkCreateDescriptorSetLayout(m_device->device(), &ds_layout_ci, &ds_layout);
@@ -2421,7 +2421,7 @@
VkDescriptorSet descriptorSet;
VkDescriptorSetAllocInfo alloc_info = {};
alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO;
- alloc_info.count = 1;
+ alloc_info.setLayoutCount = 1;
alloc_info.descriptorPool = ds_pool;
alloc_info.pSetLayouts = &ds_layout;
err = vkAllocDescriptorSets(m_device->device(), &alloc_info, &descriptorSet);
@@ -2429,7 +2429,7 @@
VkPipelineLayoutCreateInfo pipeline_layout_ci = {};
pipeline_layout_ci.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
- pipeline_layout_ci.descriptorSetCount = 1;
+ pipeline_layout_ci.setLayoutCount = 1;
pipeline_layout_ci.pSetLayouts = &ds_layout;
VkPipelineLayout pipeline_layout;
@@ -2465,9 +2465,9 @@
VkPipelineVertexInputStateCreateInfo vi_ci = {};
vi_ci.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO;
vi_ci.pNext = nullptr;
- vi_ci.bindingCount = 0;
+ vi_ci.vertexBindingDescriptionCount = 0;
vi_ci.pVertexBindingDescriptions = nullptr;
- vi_ci.attributeCount = 0;
+ vi_ci.vertexAttributeDescriptionCount = 0;
vi_ci.pVertexAttributeDescriptions = nullptr;
VkPipelineInputAssemblyStateCreateInfo ia_ci = {};
@@ -2798,7 +2798,7 @@
buffCI.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
buffCI.size = 1024;
buffCI.usage = VK_BUFFER_USAGE_INDEX_BUFFER_BIT;
- buffCI.queueFamilyCount = 1;
+ buffCI.queueFamilyIndexCount = 1;
buffCI.pQueueFamilyIndices = &qfi;
VkBuffer ib;
@@ -2854,14 +2854,14 @@
//VkDescriptorSetObj descriptorSet(m_device);
VkDescriptorTypeCount ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
- ds_type_count.count = 1;
+ ds_type_count.descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.count = 1;
- ds_pool_ci.pTypeCount = &ds_type_count;
+ ds_pool_ci.typeCount = 1;
+ ds_pool_ci.pTypeCounts = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, &ds_pool);
@@ -2875,8 +2875,8 @@
VkDescriptorSetLayoutCreateInfo ds_layout_ci = {};
ds_layout_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
ds_layout_ci.pNext = NULL;
- ds_layout_ci.count = 1;
- ds_layout_ci.pBinding = &dsl_binding;
+ ds_layout_ci.bindingCount = 1;
+ ds_layout_ci.pBindings = &dsl_binding;
VkDescriptorSetLayout ds_layout;
err = vkCreateDescriptorSetLayout(m_device->device(), &ds_layout_ci, &ds_layout);
@@ -2885,7 +2885,7 @@
VkDescriptorSet descriptorSet;
VkDescriptorSetAllocInfo alloc_info = {};
alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO;
- alloc_info.count = 1;
+ alloc_info.setLayoutCount = 1;
alloc_info.descriptorPool = ds_pool;
alloc_info.pSetLayouts = &ds_layout;
err = vkAllocDescriptorSets(m_device->device(), &alloc_info, &descriptorSet);
@@ -2920,7 +2920,7 @@
memset(&descriptor_write, 0, sizeof(descriptor_write));
descriptor_write.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
descriptor_write.destSet = descriptorSet;
- descriptor_write.count = 1;
+ descriptor_write.descriptorCount = 1;
// This is a mismatched type for the layout which expects BUFFER
descriptor_write.descriptorType = VK_DESCRIPTOR_TYPE_SAMPLER;
descriptor_write.pImageInfo = &info;
@@ -2950,14 +2950,14 @@
//VkDescriptorSetObj descriptorSet(m_device);
VkDescriptorTypeCount ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
- ds_type_count.count = 1;
+ ds_type_count.descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.count = 1;
- ds_pool_ci.pTypeCount = &ds_type_count;
+ ds_pool_ci.typeCount = 1;
+ ds_pool_ci.pTypeCounts = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, &ds_pool);
@@ -2972,8 +2972,8 @@
VkDescriptorSetLayoutCreateInfo ds_layout_ci = {};
ds_layout_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
ds_layout_ci.pNext = NULL;
- ds_layout_ci.count = 1;
- ds_layout_ci.pBinding = &dsl_binding;
+ ds_layout_ci.bindingCount = 1;
+ ds_layout_ci.pBindings = &dsl_binding;
VkDescriptorSetLayout ds_layout;
err = vkCreateDescriptorSetLayout(m_device->device(), &ds_layout_ci, &ds_layout);
@@ -2982,7 +2982,7 @@
VkDescriptorSet descriptorSet;
VkDescriptorSetAllocInfo alloc_info = {};
alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO;
- alloc_info.count = 1;
+ alloc_info.setLayoutCount = 1;
alloc_info.descriptorPool = ds_pool;
alloc_info.pSetLayouts = &ds_layout;
err = vkAllocDescriptorSets(m_device->device(), &alloc_info, &descriptorSet);
@@ -3018,7 +3018,7 @@
descriptor_write.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
descriptor_write.destSet = descriptorSet;
descriptor_write.destArrayElement = 1; /* This index out of bounds for the update */
- descriptor_write.count = 1;
+ descriptor_write.descriptorCount = 1;
// This is the wrong type, but out of bounds will be flagged first
descriptor_write.descriptorType = VK_DESCRIPTOR_TYPE_SAMPLER;
descriptor_write.pImageInfo = &info;
@@ -3048,14 +3048,14 @@
//VkDescriptorSetObj descriptorSet(m_device);
VkDescriptorTypeCount ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
- ds_type_count.count = 1;
+ ds_type_count.descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.count = 1;
- ds_pool_ci.pTypeCount = &ds_type_count;
+ ds_pool_ci.typeCount = 1;
+ ds_pool_ci.pTypeCounts = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, &ds_pool);
@@ -3070,8 +3070,8 @@
VkDescriptorSetLayoutCreateInfo ds_layout_ci = {};
ds_layout_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
ds_layout_ci.pNext = NULL;
- ds_layout_ci.count = 1;
- ds_layout_ci.pBinding = &dsl_binding;
+ ds_layout_ci.bindingCount = 1;
+ ds_layout_ci.pBindings = &dsl_binding;
VkDescriptorSetLayout ds_layout;
err = vkCreateDescriptorSetLayout(m_device->device(), &ds_layout_ci, &ds_layout);
ASSERT_VK_SUCCESS(err);
@@ -3079,7 +3079,7 @@
VkDescriptorSet descriptorSet;
VkDescriptorSetAllocInfo alloc_info = {};
alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO;
- alloc_info.count = 1;
+ alloc_info.setLayoutCount = 1;
alloc_info.descriptorPool = ds_pool;
alloc_info.pSetLayouts = &ds_layout;
err = vkAllocDescriptorSets(m_device->device(), &alloc_info, &descriptorSet);
@@ -3115,7 +3115,7 @@
descriptor_write.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
descriptor_write.destSet = descriptorSet;
descriptor_write.destBinding = 2;
- descriptor_write.count = 1;
+ descriptor_write.descriptorCount = 1;
// This is the wrong type, but out of bounds will be flagged first
descriptor_write.descriptorType = VK_DESCRIPTOR_TYPE_SAMPLER;
descriptor_write.pImageInfo = &info;
@@ -3145,14 +3145,14 @@
VkDescriptorTypeCount ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
- ds_type_count.count = 1;
+ ds_type_count.descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.count = 1;
- ds_pool_ci.pTypeCount = &ds_type_count;
+ ds_pool_ci.typeCount = 1;
+ ds_pool_ci.pTypeCounts = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, &ds_pool);
@@ -3166,8 +3166,8 @@
VkDescriptorSetLayoutCreateInfo ds_layout_ci = {};
ds_layout_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
ds_layout_ci.pNext = NULL;
- ds_layout_ci.count = 1;
- ds_layout_ci.pBinding = &dsl_binding;
+ ds_layout_ci.bindingCount = 1;
+ ds_layout_ci.pBindings = &dsl_binding;
VkDescriptorSetLayout ds_layout;
err = vkCreateDescriptorSetLayout(m_device->device(), &ds_layout_ci, &ds_layout);
@@ -3176,7 +3176,7 @@
VkDescriptorSet descriptorSet;
VkDescriptorSetAllocInfo alloc_info = {};
alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO;
- alloc_info.count = 1;
+ alloc_info.setLayoutCount = 1;
alloc_info.descriptorPool = ds_pool;
alloc_info.pSetLayouts = &ds_layout;
err = vkAllocDescriptorSets(m_device->device(), &alloc_info, &descriptorSet);
@@ -3211,7 +3211,7 @@
memset(&descriptor_write, 0, sizeof(descriptor_write));
descriptor_write.sType = (VkStructureType)0x99999999; /* Intentionally broken struct type */
descriptor_write.destSet = descriptorSet;
- descriptor_write.count = 1;
+ descriptor_write.descriptorCount = 1;
// This is the wrong type, but out of bounds will be flagged first
descriptor_write.descriptorType = VK_DESCRIPTOR_TYPE_SAMPLER;
descriptor_write.pImageInfo = &info;
@@ -3241,14 +3241,14 @@
// TODO : Farm Descriptor setup code to helper function(s) to reduce copied code
VkDescriptorTypeCount ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_SAMPLER;
- ds_type_count.count = 1;
+ ds_type_count.descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.count = 1;
- ds_pool_ci.pTypeCount = &ds_type_count;
+ ds_pool_ci.typeCount = 1;
+ ds_pool_ci.pTypeCounts = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, &ds_pool);
@@ -3263,8 +3263,8 @@
VkDescriptorSetLayoutCreateInfo ds_layout_ci = {};
ds_layout_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
ds_layout_ci.pNext = NULL;
- ds_layout_ci.count = 1;
- ds_layout_ci.pBinding = &dsl_binding;
+ ds_layout_ci.bindingCount = 1;
+ ds_layout_ci.pBindings = &dsl_binding;
VkDescriptorSetLayout ds_layout;
err = vkCreateDescriptorSetLayout(m_device->device(), &ds_layout_ci, &ds_layout);
ASSERT_VK_SUCCESS(err);
@@ -3272,7 +3272,7 @@
VkDescriptorSet descriptorSet;
VkDescriptorSetAllocInfo alloc_info = {};
alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO;
- alloc_info.count = 1;
+ alloc_info.setLayoutCount = 1;
alloc_info.descriptorPool = ds_pool;
alloc_info.pSetLayouts = &ds_layout;
err = vkAllocDescriptorSets(m_device->device(), &alloc_info, &descriptorSet);
@@ -3289,7 +3289,7 @@
descriptor_write.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
descriptor_write.destSet = descriptorSet;
descriptor_write.destBinding = 0;
- descriptor_write.count = 1;
+ descriptor_write.descriptorCount = 1;
descriptor_write.descriptorType = VK_DESCRIPTOR_TYPE_SAMPLER;
descriptor_write.pImageInfo = &descriptor_info;
@@ -3316,14 +3316,14 @@
m_errorMonitor->ClearState();
VkDescriptorTypeCount ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
- ds_type_count.count = 1;
+ ds_type_count.descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.count = 1;
- ds_pool_ci.pTypeCount = &ds_type_count;
+ ds_pool_ci.typeCount = 1;
+ ds_pool_ci.pTypeCounts = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, &ds_pool);
@@ -3338,8 +3338,8 @@
VkDescriptorSetLayoutCreateInfo ds_layout_ci = {};
ds_layout_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
ds_layout_ci.pNext = NULL;
- ds_layout_ci.count = 1;
- ds_layout_ci.pBinding = &dsl_binding;
+ ds_layout_ci.bindingCount = 1;
+ ds_layout_ci.pBindings = &dsl_binding;
VkDescriptorSetLayout ds_layout;
err = vkCreateDescriptorSetLayout(m_device->device(), &ds_layout_ci, &ds_layout);
ASSERT_VK_SUCCESS(err);
@@ -3347,7 +3347,7 @@
VkDescriptorSet descriptorSet;
VkDescriptorSetAllocInfo alloc_info = {};
alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO;
- alloc_info.count = 1;
+ alloc_info.setLayoutCount = 1;
alloc_info.descriptorPool = ds_pool;
alloc_info.pSetLayouts = &ds_layout;
err = vkAllocDescriptorSets(m_device->device(), &alloc_info, &descriptorSet);
@@ -3387,7 +3387,7 @@
descriptor_write.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
descriptor_write.destSet = descriptorSet;
descriptor_write.destBinding = 0;
- descriptor_write.count = 1;
+ descriptor_write.descriptorCount = 1;
descriptor_write.descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
descriptor_write.pImageInfo = &descriptor_info;
@@ -3416,16 +3416,16 @@
//VkDescriptorSetObj descriptorSet(m_device);
VkDescriptorTypeCount ds_type_count[2] = {};
ds_type_count[0].type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
- ds_type_count[0].count = 1;
+ ds_type_count[0].descriptorCount = 1;
ds_type_count[1].type = VK_DESCRIPTOR_TYPE_SAMPLER;
- ds_type_count[1].count = 1;
+ ds_type_count[1].descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.count = 2;
- ds_pool_ci.pTypeCount = ds_type_count;
+ ds_pool_ci.typeCount = 2;
+ ds_pool_ci.pTypeCounts = ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, &ds_pool);
@@ -3443,8 +3443,8 @@
VkDescriptorSetLayoutCreateInfo ds_layout_ci = {};
ds_layout_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
ds_layout_ci.pNext = NULL;
- ds_layout_ci.count = 2;
- ds_layout_ci.pBinding = dsl_binding;
+ ds_layout_ci.bindingCount = 2;
+ ds_layout_ci.pBindings = dsl_binding;
VkDescriptorSetLayout ds_layout;
err = vkCreateDescriptorSetLayout(m_device->device(), &ds_layout_ci, &ds_layout);
@@ -3453,7 +3453,7 @@
VkDescriptorSet descriptorSet;
VkDescriptorSetAllocInfo alloc_info = {};
alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO;
- alloc_info.count = 1;
+ alloc_info.setLayoutCount = 1;
alloc_info.descriptorPool = ds_pool;
alloc_info.pSetLayouts = &ds_layout;
err = vkAllocDescriptorSets(m_device->device(), &alloc_info, &descriptorSet);
@@ -3489,7 +3489,7 @@
descriptor_write.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
descriptor_write.destSet = descriptorSet;
descriptor_write.destBinding = 1; // SAMPLER binding from layout above
- descriptor_write.count = 1;
+ descriptor_write.descriptorCount = 1;
descriptor_write.descriptorType = VK_DESCRIPTOR_TYPE_SAMPLER;
descriptor_write.pImageInfo = &info;
// This write update should succeed
@@ -3502,7 +3502,7 @@
copy_ds_update.srcBinding = 1; // copy from SAMPLER binding
copy_ds_update.destSet = descriptorSet;
copy_ds_update.destBinding = 0; // ERROR : copy to UNIFORM binding
- copy_ds_update.count = 1; // copy 1 descriptor
+ copy_ds_update.descriptorCount = 1; // copy 1 descriptor
vkUpdateDescriptorSets(m_device->device(), 0, NULL, 1, ©_ds_update);
msgFlags = m_errorMonitor->GetState(&msgString);
@@ -3517,7 +3517,7 @@
copy_ds_update.srcBinding = 3; // ERROR : Invalid binding for matching layout
copy_ds_update.destSet = descriptorSet;
copy_ds_update.destBinding = 0;
- copy_ds_update.count = 1; // copy 1 descriptor
+ copy_ds_update.descriptorCount = 1; // copy 1 descriptor
vkUpdateDescriptorSets(m_device->device(), 0, NULL, 1, ©_ds_update);
msgFlags = m_errorMonitor->GetState(&msgString);
@@ -3532,7 +3532,7 @@
copy_ds_update.srcBinding = 1;
copy_ds_update.destSet = descriptorSet;
copy_ds_update.destBinding = 0;
- copy_ds_update.count = 5; // ERROR copy 5 descriptors (out of bounds for layout)
+ copy_ds_update.descriptorCount = 5; // ERROR copy 5 descriptors (out of bounds for layout)
vkUpdateDescriptorSets(m_device->device(), 0, NULL, 1, ©_ds_update);
msgFlags = m_errorMonitor->GetState(&msgString);
@@ -3558,14 +3558,14 @@
m_errorMonitor->ClearState();
VkDescriptorTypeCount ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
- ds_type_count.count = 1;
+ ds_type_count.descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.count = 1;
- ds_pool_ci.pTypeCount = &ds_type_count;
+ ds_pool_ci.typeCount = 1;
+ ds_pool_ci.pTypeCounts = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, &ds_pool);
@@ -3580,8 +3580,8 @@
VkDescriptorSetLayoutCreateInfo ds_layout_ci = {};
ds_layout_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
ds_layout_ci.pNext = NULL;
- ds_layout_ci.count = 1;
- ds_layout_ci.pBinding = &dsl_binding;
+ ds_layout_ci.bindingCount = 1;
+ ds_layout_ci.pBindings = &dsl_binding;
VkDescriptorSetLayout ds_layout;
err = vkCreateDescriptorSetLayout(m_device->device(), &ds_layout_ci, &ds_layout);
@@ -3590,7 +3590,7 @@
VkDescriptorSet descriptorSet;
VkDescriptorSetAllocInfo alloc_info = {};
alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO;
- alloc_info.count = 1;
+ alloc_info.setLayoutCount = 1;
alloc_info.descriptorPool = ds_pool;
alloc_info.pSetLayouts = &ds_layout;
err = vkAllocDescriptorSets(m_device->device(), &alloc_info, &descriptorSet);
@@ -3607,7 +3607,7 @@
VkPipelineLayoutCreateInfo pipeline_layout_ci = {};
pipeline_layout_ci.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
pipeline_layout_ci.pNext = NULL;
- pipeline_layout_ci.descriptorSetCount = 1;
+ pipeline_layout_ci.setLayoutCount = 1;
pipeline_layout_ci.pSetLayouts = &ds_layout;
VkPipelineLayout pipeline_layout;
@@ -3650,14 +3650,14 @@
VkDescriptorTypeCount ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
- ds_type_count.count = 1;
+ ds_type_count.descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.count = 1;
- ds_pool_ci.pTypeCount = &ds_type_count;
+ ds_pool_ci.typeCount = 1;
+ ds_pool_ci.pTypeCounts = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, &ds_pool);
@@ -3672,8 +3672,8 @@
VkDescriptorSetLayoutCreateInfo ds_layout_ci = {};
ds_layout_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
ds_layout_ci.pNext = NULL;
- ds_layout_ci.count = 1;
- ds_layout_ci.pBinding = &dsl_binding;
+ ds_layout_ci.bindingCount = 1;
+ ds_layout_ci.pBindings = &dsl_binding;
VkDescriptorSetLayout ds_layout;
err = vkCreateDescriptorSetLayout(m_device->device(), &ds_layout_ci, &ds_layout);
@@ -3682,7 +3682,7 @@
VkDescriptorSet descriptorSet;
VkDescriptorSetAllocInfo alloc_info = {};
alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO;
- alloc_info.count = 1;
+ alloc_info.setLayoutCount = 1;
alloc_info.descriptorPool = ds_pool;
alloc_info.pSetLayouts = &ds_layout;
err = vkAllocDescriptorSets(m_device->device(), &alloc_info, &descriptorSet);
@@ -3699,7 +3699,7 @@
VkPipelineLayoutCreateInfo pipeline_layout_ci = {};
pipeline_layout_ci.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
pipeline_layout_ci.pNext = NULL;
- pipeline_layout_ci.descriptorSetCount = 1;
+ pipeline_layout_ci.setLayoutCount = 1;
pipeline_layout_ci.pSetLayouts = &ds_layout;
VkPipelineLayout pipeline_layout;
@@ -3755,14 +3755,14 @@
VkDescriptorTypeCount ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
- ds_type_count.count = 1;
+ ds_type_count.descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.count = 1;
- ds_pool_ci.pTypeCount = &ds_type_count;
+ ds_pool_ci.typeCount = 1;
+ ds_pool_ci.pTypeCounts = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, &ds_pool);
@@ -3777,8 +3777,8 @@
VkDescriptorSetLayoutCreateInfo ds_layout_ci = {};
ds_layout_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
ds_layout_ci.pNext = NULL;
- ds_layout_ci.count = 1;
- ds_layout_ci.pBinding = &dsl_binding;
+ ds_layout_ci.bindingCount = 1;
+ ds_layout_ci.pBindings = &dsl_binding;
VkDescriptorSetLayout ds_layout;
err = vkCreateDescriptorSetLayout(m_device->device(), &ds_layout_ci, &ds_layout);
@@ -3787,7 +3787,7 @@
VkDescriptorSet descriptorSet;
VkDescriptorSetAllocInfo alloc_info = {};
alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO;
- alloc_info.count = 1;
+ alloc_info.setLayoutCount = 1;
alloc_info.descriptorPool = ds_pool;
alloc_info.pSetLayouts = &ds_layout;
err = vkAllocDescriptorSets(m_device->device(), &alloc_info, &descriptorSet);
@@ -3804,7 +3804,7 @@
VkPipelineLayoutCreateInfo pipeline_layout_ci = {};
pipeline_layout_ci.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
pipeline_layout_ci.pNext = NULL;
- pipeline_layout_ci.descriptorSetCount = 1;
+ pipeline_layout_ci.setLayoutCount = 1;
pipeline_layout_ci.pSetLayouts = &ds_layout;
VkPipelineLayout pipeline_layout;
@@ -5509,14 +5509,14 @@
m_errorMonitor->ClearState();
VkDescriptorTypeCount ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE;
- ds_type_count.count = 1;
+ ds_type_count.descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.count = 1;
- ds_pool_ci.pTypeCount = &ds_type_count;
+ ds_pool_ci.typeCount = 1;
+ ds_pool_ci.pTypeCounts = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, &ds_pool);
@@ -5531,8 +5531,8 @@
VkDescriptorSetLayoutCreateInfo ds_layout_ci = {};
ds_layout_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
ds_layout_ci.pNext = NULL;
- ds_layout_ci.count = 1;
- ds_layout_ci.pBinding = &dsl_binding;
+ ds_layout_ci.bindingCount = 1;
+ ds_layout_ci.pBindings = &dsl_binding;
VkDescriptorSetLayout ds_layout;
err = vkCreateDescriptorSetLayout(m_device->device(), &ds_layout_ci, &ds_layout);
ASSERT_VK_SUCCESS(err);
@@ -5540,7 +5540,7 @@
VkDescriptorSet descriptorSet;
VkDescriptorSetAllocInfo alloc_info = {};
alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO;
- alloc_info.count = 1;
+ alloc_info.setLayoutCount = 1;
alloc_info.descriptorPool = ds_pool;
alloc_info.pSetLayouts = &ds_layout;
err = vkAllocDescriptorSets(m_device->device(), &alloc_info, &descriptorSet);
diff --git a/tests/test_environment.cpp b/tests/test_environment.cpp
index da62397..0709744 100644
--- a/tests/test_environment.cpp
+++ b/tests/test_environment.cpp
@@ -88,9 +88,9 @@
inst_info.pNext = NULL;
inst_info.pAppInfo = &app_;
inst_info.pAllocCb = NULL;
- inst_info.extensionCount = instance_extension_names.size();
+ inst_info.enabledExtensionNameCount = instance_extension_names.size();
inst_info.ppEnabledExtensionNames = (instance_extension_names.size()) ? &instance_extension_names[0] : NULL;
- inst_info.layerCount = 0;
+ inst_info.enabledLayerNameCount = 0;
inst_info.ppEnabledLayerNames = NULL;
err = vkCreateInstance(&inst_info, &inst);
ASSERT_EQ(VK_SUCCESS, err);
diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index 5b7ac18..1d868d5 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -99,9 +99,9 @@
instInfo.pNext = NULL;
instInfo.pAppInfo = &app_info;
instInfo.pAllocCb = NULL;
- instInfo.layerCount = instance_layer_names.size();
+ instInfo.enabledLayerNameCount = instance_layer_names.size();
instInfo.ppEnabledLayerNames = instance_layer_names.data();
- instInfo.extensionCount = instance_extension_names.size();
+ instInfo.enabledExtensionNameCount = instance_extension_names.size();
instInfo.ppEnabledExtensionNames = instance_extension_names.data();
err = vkCreateInstance(&instInfo, &this->inst);
ASSERT_VK_SUCCESS(err);
@@ -339,9 +339,9 @@
subpass.pNext = NULL;
subpass.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS;
subpass.flags = 0;
- subpass.inputCount = 0;
+ subpass.inputAttachmentCount = 0;
subpass.pInputAttachments = NULL;
- subpass.colorCount = targets;
+ subpass.colorAttachmentCount = targets;
subpass.pColorAttachments = color_references.data();
subpass.pResolveAttachments = NULL;
@@ -367,7 +367,7 @@
subpass.depthStencilAttachment.attachment = VK_ATTACHMENT_UNUSED;
}
- subpass.preserveCount = 0;
+ subpass.preserveAttachmentCount = 0;
subpass.pPreserveAttachments = NULL;
VkRenderPassCreateInfo rp_info = {};
@@ -444,7 +444,7 @@
/* request a descriptor but do not update it */
VkDescriptorTypeCount tc = {};
tc.type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER;
- tc.count = 1;
+ tc.descriptorCount = 1;
m_type_counts.push_back(tc);
return m_nextSlot++;
@@ -458,7 +458,7 @@
type == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC);
VkDescriptorTypeCount tc = {};
tc.type = type;
- tc.count = 1;
+ tc.descriptorCount = 1;
m_type_counts.push_back(tc);
m_writes.push_back(vk_testing::Device::write_descriptor_set(vk_testing::DescriptorSet(),
@@ -471,7 +471,7 @@
{
VkDescriptorTypeCount tc = {};
tc.type = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
- tc.count = 1;
+ tc.descriptorCount = 1;
m_type_counts.push_back(tc);
VkDescriptorImageInfo tmp = texture->m_imageInfo;
@@ -499,9 +499,9 @@
// create VkDescriptorPool
VkDescriptorPoolCreateInfo pool = {};
pool.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
- pool.count = m_type_counts.size();
+ pool.typeCount = m_type_counts.size();
pool.maxSets = 1;
- pool.pTypeCount = m_type_counts.data();
+ pool.pTypeCounts = m_type_counts.data();
init(*m_device, pool);
// create VkDescriptorSetLayout
@@ -509,7 +509,7 @@
bindings.resize(m_type_counts.size());
for (int i = 0; i < m_type_counts.size(); i++) {
bindings[i].descriptorType = m_type_counts[i].type;
- bindings[i].arraySize = m_type_counts[i].count;
+ bindings[i].arraySize = m_type_counts[i].descriptorCount;
bindings[i].stageFlags = VK_SHADER_STAGE_ALL;
bindings[i].pImmutableSamplers = NULL;
}
@@ -517,8 +517,8 @@
// create VkDescriptorSetLayout
VkDescriptorSetLayoutCreateInfo layout = {};
layout.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
- layout.count = bindings.size();
- layout.pBinding = bindings.data();
+ layout.bindingCount = bindings.size();
+ layout.pBindings = bindings.data();
m_layout.init(*m_device, layout);
vector<const vk_testing::DescriptorSetLayout *> layouts;
@@ -527,7 +527,7 @@
// create VkPipelineLayout
VkPipelineLayoutCreateInfo pipeline_layout = {};
pipeline_layout.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
- pipeline_layout.descriptorSetCount = layouts.size();
+ pipeline_layout.setLayoutCount = layouts.size();
pipeline_layout.pSetLayouts = NULL;
m_pipeline_layout.init(*m_device, pipeline_layout, layouts);
@@ -992,11 +992,11 @@
VkSubmitInfo submit_info;
submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
submit_info.pNext = NULL;
- submit_info.waitSemCount = 0;
+ submit_info.waitSemaphoreCount = 0;
submit_info.pWaitSemaphores = NULL;
- submit_info.cmdBufferCount = 1;
+ submit_info.commandBufferCount = 1;
submit_info.pCommandBuffers = bufferArray;
- submit_info.signalSemCount = 0;
+ submit_info.signalSemaphoreCount = 0;
submit_info.pSignalSemaphores = NULL;
err = vkQueueSubmit(m_device->m_queue, 1, &submit_info, m_fence.handle());
@@ -1119,9 +1119,9 @@
m_device = device;
m_vi_state.pNext = VK_NULL_HANDLE;
- m_vi_state.bindingCount = 0;
+ m_vi_state.vertexBindingDescriptionCount = 0;
m_vi_state.pVertexBindingDescriptions = VK_NULL_HANDLE;
- m_vi_state.attributeCount = 0;
+ m_vi_state.vertexAttributeDescriptionCount = 0;
m_vi_state.pVertexAttributeDescriptions = VK_NULL_HANDLE;
m_vertexBufferCount = 0;
@@ -1197,13 +1197,13 @@
void VkPipelineObj::AddVertexInputAttribs(VkVertexInputAttributeDescription* vi_attrib, int count)
{
m_vi_state.pVertexAttributeDescriptions = vi_attrib;
- m_vi_state.attributeCount = count;
+ m_vi_state.vertexAttributeDescriptionCount = count;
}
void VkPipelineObj::AddVertexInputBindings(VkVertexInputBindingDescription* vi_binding, int count)
{
m_vi_state.pVertexBindingDescriptions = vi_binding;
- m_vi_state.bindingCount = count;
+ m_vi_state.vertexBindingDescriptionCount = count;
}
void VkPipelineObj::AddColorAttachment(uint32_t binding, const VkPipelineColorBlendAttachmentState *att)
@@ -1276,7 +1276,7 @@
memcpy((void*)&info.pStages[i], shaderCreateInfo, sizeof(VkPipelineShaderStageCreateInfo));
}
- if (m_vi_state.attributeCount && m_vi_state.bindingCount) {
+ if (m_vi_state.vertexAttributeDescriptionCount && m_vi_state.vertexBindingDescriptionCount) {
m_vi_state.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO;
info.pVertexInputState = &m_vi_state;
} else {
@@ -1606,11 +1606,11 @@
VkSubmitInfo submit_info;
submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
submit_info.pNext = NULL;
- submit_info.waitSemCount = 0;
+ submit_info.waitSemaphoreCount = 0;
submit_info.pWaitSemaphores = NULL;
- submit_info.cmdBufferCount = 1;
+ submit_info.commandBufferCount = 1;
submit_info.pCommandBuffers = &handle();
- submit_info.signalSemCount = 0;
+ submit_info.signalSemaphoreCount = 0;
submit_info.pSignalSemaphores = NULL;
err = vkQueueSubmit( m_device->m_queue, 1, &submit_info, fence );
@@ -1684,7 +1684,7 @@
image_info.usage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
image_info.flags = 0;
image_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
- image_info.queueFamilyCount = 0;
+ image_info.queueFamilyIndexCount = 0;
image_info.pQueueFamilyIndices = NULL;
init(*m_device, image_info);
diff --git a/tests/vktestbinding.cpp b/tests/vktestbinding.cpp
index a6fc872..3f8cf56 100644
--- a/tests/vktestbinding.cpp
+++ b/tests/vktestbinding.cpp
@@ -274,8 +274,8 @@
qi.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
qi.pNext = NULL;
qi.queueFamilyIndex = i;
- qi.queueCount = queue_props[i].queueCount;
- std::vector<float> queue_priorities (qi.queueCount, 0.0);
+ qi.queuePriorityCount = queue_props[i].queueCount;
+ std::vector<float> queue_priorities (qi.queuePriorityCount, 0.0);
qi.pQueuePriorities = queue_priorities.data();
if (queue_props[i].queueFlags & VK_QUEUE_GRAPHICS_BIT) {
graphics_queue_node_index_ = i;
@@ -288,9 +288,9 @@
dev_info.pNext = NULL;
dev_info.requestedQueueCount = queue_info.size();
dev_info.pRequestedQueues = queue_info.data();
- dev_info.layerCount = layers.size();
+ dev_info.enabledLayerNameCount = layers.size();
dev_info.ppEnabledLayerNames = layers.data();
- dev_info.extensionCount = extensions.size();
+ dev_info.enabledExtensionNameCount = extensions.size();
dev_info.ppEnabledExtensionNames = extensions.data();
init(dev_info);
@@ -398,11 +398,11 @@
VkSubmitInfo submit_info;
submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
submit_info.pNext = NULL;
- submit_info.waitSemCount = 0;
+ submit_info.waitSemaphoreCount = 0;
submit_info.pWaitSemaphores = NULL;
- submit_info.cmdBufferCount = (uint32_t)cmd_handles.size();
+ submit_info.commandBufferCount = (uint32_t)cmd_handles.size();
submit_info.pCommandBuffers = cmd_handles.data();
- submit_info.signalSemCount = 0;
+ submit_info.signalSemaphoreCount = 0;
submit_info.pSignalSemaphores = NULL;
EXPECT(vkQueueSubmit(handle(), 1, &submit_info, fence.handle()) == VK_SUCCESS);
@@ -751,7 +751,7 @@
VkDescriptorSetAllocInfo alloc_info = {};
alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO;
- alloc_info.count = layout_handles.size();
+ alloc_info.setLayoutCount = layout_handles.size();
alloc_info.descriptorPool = handle();
alloc_info.pSetLayouts = layout_handles.data();
VkResult err = vkAllocDescriptorSets(device(), &alloc_info, set_handles.data());
diff --git a/tests/vktestbinding.h b/tests/vktestbinding.h
index 04e84b2..f723de2 100644
--- a/tests/vktestbinding.h
+++ b/tests/vktestbinding.h
@@ -816,7 +816,7 @@
write.destSet = set.handle();
write.destBinding = binding;
write.destArrayElement = array_element;
- write.count = count;
+ write.descriptorCount = count;
write.descriptorType = type;
write.pImageInfo = image_info;
return write;
@@ -830,7 +830,7 @@
write.destSet = set.handle();
write.destBinding = binding;
write.destArrayElement = array_element;
- write.count = count;
+ write.descriptorCount = count;
write.descriptorType = type;
write.pBufferInfo = buffer_info;
return write;
@@ -844,7 +844,7 @@
write.destSet = set.handle();
write.destBinding = binding;
write.destArrayElement = array_element;
- write.count = count;
+ write.descriptorCount = count;
write.descriptorType = type;
write.pTexelBufferView = buffer_views;
return write;
@@ -880,7 +880,7 @@
copy.destSet = dst_set.handle();
copy.destBinding = dst_binding;
copy.destArrayElement = dst_array_element;
- copy.count = count;
+ copy.descriptorCount = count;
return copy;
}
@@ -890,7 +890,7 @@
VkCmdBufferAllocInfo info = {};
info.sType = VK_STRUCTURE_TYPE_CMD_BUFFER_ALLOC_INFO;
info.cmdPool = pool;
- info.count = 1;
+ info.bufferCount = 1;
return info;
}
diff --git a/tests/vktestframework.cpp b/tests/vktestframework.cpp
index fd504ab..1cab1c0 100644
--- a/tests/vktestframework.cpp
+++ b/tests/vktestframework.cpp
@@ -587,11 +587,11 @@
VkSubmitInfo submit_info;
submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
submit_info.pNext = NULL;
- submit_info.waitSemCount = 1;
+ submit_info.waitSemaphoreCount = 1;
submit_info.pWaitSemaphores = &presentCompleteSemaphore,
- submit_info.cmdBufferCount = 1;
+ submit_info.commandBufferCount = 1;
submit_info.pCommandBuffers = cmdBufs;
- submit_info.signalSemCount = 0;
+ submit_info.signalSemaphoreCount = 0;
submit_info.pSignalSemaphores = NULL;
vkQueueSubmit(m_queue.handle(), 1, &submit_info, nullFence);
@@ -1031,11 +1031,11 @@
VkSubmitInfo submit_info;
submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
submit_info.pNext = NULL;
- submit_info.waitSemCount = 0;
+ submit_info.waitSemaphoreCount = 0;
submit_info.pWaitSemaphores = NULL;
- submit_info.cmdBufferCount = 1;
+ submit_info.commandBufferCount = 1;
submit_info.pCommandBuffers = cmd_bufs;
- submit_info.signalSemCount = 0;
+ submit_info.signalSemaphoreCount = 0;
submit_info.pSignalSemaphores = NULL;
err = vkQueueSubmit(m_queue.handle(), 1, &submit_info, nullFence);