test: WriteDescriptorSetIntegrityCheck fix from GH421
Remove accidentally inserted code snippet which caused
test to crash.
Change-Id: Ic4cd91b05c0cb9b6d105776ec673be62861533ae
diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 1bfc6df..e965b18 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -4484,7 +4484,6 @@
m_errorMonitor->VerifyFound();
}
-/* Test crashes on multiple platforms, disabling for now
TEST_F(VkLayerTest, WriteDescriptorSetIntegrityCheck) {
TEST_DESCRIPTION("This test verifies some requirements of chapter 13.2.3 of the Vulkan Spec "
"1) A uniform buffer update must have a valid buffer index."
@@ -4503,9 +4502,6 @@
"Attempting write update to descriptor set 0000000000000005 binding #1 "
"with #2 descriptors being updated but this update oversteps the bounds";
- const char *attachment_ErrorMessage =
- "Attempted write update to image descriptor failed due to: ";
-
m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, invalid_BufferInfo_ErrorMessage);
ASSERT_NO_FATAL_FAILURE(InitState());
@@ -4529,7 +4525,7 @@
VkResult err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, NULL, &ds_pool);
ASSERT_VK_SUCCESS(err);
- VkDescriptorSetLayoutBinding layout_binding[4] = {};
+ VkDescriptorSetLayoutBinding layout_binding[3] = {};
layout_binding[0].binding = 0;
layout_binding[0].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
layout_binding[0].descriptorCount = 1;
@@ -4571,11 +4567,6 @@
layout_binding[2].stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT;
layout_binding[2].pImmutableSamplers = static_cast<VkSampler *>(&sampler);
- layout_binding[3].binding = 3;
- layout_binding[2].descriptorType = VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT;
- layout_binding[2].descriptorCount = 1;
- layout_binding[2].stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT;
-
VkDescriptorSetLayoutCreateInfo ds_layout_ci = {};
ds_layout_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
ds_layout_ci.bindingCount = sizeof(layout_binding) / sizeof(VkDescriptorSetLayoutBinding);
@@ -4643,20 +4634,12 @@
vkUpdateDescriptorSets(m_device->device(), 1, &descriptor_write, 0, NULL);
m_errorMonitor->VerifyFound();
- descriptor_write.dstBinding = 3;
- descriptor_write.descriptorCount = 1;
- descriptor_write.descriptorType = VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT;
- m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, attachment_ErrorMessage);
- vkUpdateDescriptorSets(m_device->device(), 1, &descriptor_write, 0, NULL);
- m_errorMonitor->VerifyFound();
-
vkDestroyBuffer(m_device->device(), dyub, NULL);
vkDestroySampler(m_device->device(), sampler, NULL);
vkDestroyPipelineLayout(m_device->device(), pipeline_layout, NULL);
vkDestroyDescriptorSetLayout(m_device->device(), ds_layout, NULL);
vkDestroyDescriptorPool(m_device->device(), ds_pool, NULL);
}
-*/
TEST_F(VkLayerTest, InvalidPipeline) {
// Attempt to bind an invalid Pipeline to a valid Command Buffer