tests:Update AllocDescriptorFromEmptyPool
Update the AllocDescriptorFromEmptyPool test with a new case where
we attempt to allocate more sets than available.
Update the error checking for both cases to use the unique error enum
instead of string matching.
Also update database file to reflect new test case.
diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 3a9b073..82e53fe 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -3637,13 +3637,9 @@
}
TEST_F(VkLayerTest, AllocDescriptorFromEmptyPool) {
- // Initiate Draw w/o a PSO bound
+ TEST_DESCRIPTION("Attempt to allocate more sets and descriptors than descriptor pool has available.");
VkResult err;
- m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, "Unable to allocate 1 descriptors of "
- "type "
- "VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER ");
-
ASSERT_NO_FATAL_FAILURE(InitState());
ASSERT_NO_FATAL_FAILURE(InitRenderTarget());
@@ -3651,7 +3647,7 @@
// descriptor from it
VkDescriptorPoolSize ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_SAMPLER;
- ds_type_count.descriptorCount = 1;
+ ds_type_count.descriptorCount = 2;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
@@ -3665,6 +3661,37 @@
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, NULL, &ds_pool);
ASSERT_VK_SUCCESS(err);
+ VkDescriptorSetLayoutBinding dsl_binding_samp = {};
+ dsl_binding_samp.binding = 0;
+ dsl_binding_samp.descriptorType = VK_DESCRIPTOR_TYPE_SAMPLER;
+ dsl_binding_samp.descriptorCount = 1;
+ dsl_binding_samp.stageFlags = VK_SHADER_STAGE_ALL;
+ dsl_binding_samp.pImmutableSamplers = NULL;
+
+ VkDescriptorSetLayoutCreateInfo ds_layout_ci = {};
+ ds_layout_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
+ ds_layout_ci.pNext = NULL;
+ ds_layout_ci.bindingCount = 1;
+ ds_layout_ci.pBindings = &dsl_binding_samp;
+
+ VkDescriptorSetLayout ds_layout_samp;
+ err = vkCreateDescriptorSetLayout(m_device->device(), &ds_layout_ci, NULL, &ds_layout_samp);
+ ASSERT_VK_SUCCESS(err);
+
+ // Try to allocate 2 sets when pool only has 1 set
+ VkDescriptorSet descriptor_sets[2];
+ VkDescriptorSetLayout set_layouts[2] = {ds_layout_samp, ds_layout_samp};
+ VkDescriptorSetAllocateInfo alloc_info = {};
+ alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
+ alloc_info.descriptorSetCount = 2;
+ alloc_info.descriptorPool = ds_pool;
+ alloc_info.pSetLayouts = set_layouts;
+ m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, VALIDATION_ERROR_00911);
+ err = vkAllocateDescriptorSets(m_device->device(), &alloc_info, descriptor_sets);
+ m_errorMonitor->VerifyFound();
+
+ alloc_info.descriptorSetCount = 1;
+ // Create layout w/ descriptor type not available in pool
VkDescriptorSetLayoutBinding dsl_binding = {};
dsl_binding.binding = 0;
dsl_binding.descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
@@ -3672,27 +3699,22 @@
dsl_binding.stageFlags = VK_SHADER_STAGE_ALL;
dsl_binding.pImmutableSamplers = NULL;
- VkDescriptorSetLayoutCreateInfo ds_layout_ci = {};
- ds_layout_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
- ds_layout_ci.pNext = NULL;
ds_layout_ci.bindingCount = 1;
ds_layout_ci.pBindings = &dsl_binding;
- VkDescriptorSetLayout ds_layout;
- err = vkCreateDescriptorSetLayout(m_device->device(), &ds_layout_ci, NULL, &ds_layout);
+ VkDescriptorSetLayout ds_layout_ub;
+ err = vkCreateDescriptorSetLayout(m_device->device(), &ds_layout_ci, NULL, &ds_layout_ub);
ASSERT_VK_SUCCESS(err);
- VkDescriptorSet descriptorSet;
- VkDescriptorSetAllocateInfo alloc_info = {};
- alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
+ VkDescriptorSet descriptor_set;
alloc_info.descriptorSetCount = 1;
- alloc_info.descriptorPool = ds_pool;
- alloc_info.pSetLayouts = &ds_layout;
- err = vkAllocateDescriptorSets(m_device->device(), &alloc_info, &descriptorSet);
+ alloc_info.pSetLayouts = &ds_layout_ub;
+ m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, VALIDATION_ERROR_00912);
+ err = vkAllocateDescriptorSets(m_device->device(), &alloc_info, &descriptor_set);
m_errorMonitor->VerifyFound();
- vkDestroyDescriptorSetLayout(m_device->device(), ds_layout, NULL);
+ vkDestroyDescriptorSetLayout(m_device->device(), ds_layout_ub, NULL);
vkDestroyDescriptorPool(m_device->device(), ds_pool, NULL);
}