commit 5c838ce2211aa46d755e866152b6beeaf4e4fc17
author Mark Mueller <markm@lunarg.com> Thu Jun 16 09:54:29 2016 -0600
committer Mark Mueller <markm@lunarg.com> Thu Jun 16 12:10:50 2016 -0600
tree c18dacb5ee98158f30e6a676b29d364a90d04e78
parent b98967288c70884b062e07a8ad63b1e220934245

test: WriteDescriptorSetIntegrityCheck fixes from GH421

1) Add missing '=' for structure initialization which somehow
sneaks through compilation and clang analysis.

2) Truncate expected error messages to mask disparate results
between windows and linux

Change-Id: I8f92683d6c0d0f4cef8aa04d6ffa2902c497f182

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index e965b18..d2346ea 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -4496,11 +4496,9 @@
             "VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC or "
             "VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC, pDescriptorWrites[0].pBufferInfo must not be NULL";
     const char *stateFlag_ErrorMessage =
-            "Attempting write update to descriptor set 0000000000000005 binding #0 "
-            "with #2 descriptors being updated but this update oversteps the bounds";
+            "Attempting write update to descriptor set ";
     const char *immutable_ErrorMessage =
-            "Attempting write update to descriptor set 0000000000000005 binding #1 "
-            "with #2 descriptors being updated but this update oversteps the bounds";
+            "Attempting write update to descriptor set ";
 
     m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, invalid_BufferInfo_ErrorMessage);
 
@@ -4594,13 +4592,14 @@
     err = vkCreatePipelineLayout(m_device->device(), &pipeline_layout_ci, NULL, &pipeline_layout);
     ASSERT_VK_SUCCESS(err);
 
-    VkWriteDescriptorSet descriptor_write {};
+    VkWriteDescriptorSet descriptor_write = {};
     descriptor_write.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
     descriptor_write.dstSet = descriptorSet;
     descriptor_write.dstBinding = 0;
     descriptor_write.descriptorCount = 1;
     descriptor_write.descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
 
+    // 1) The uniform buffer is intentionally invalid here
     vkUpdateDescriptorSets(m_device->device(), 1, &descriptor_write, 0, NULL);
     m_errorMonitor->VerifyFound();
 
@@ -4624,12 +4623,21 @@
     descriptor_write.pBufferInfo = &buffInfo;
     descriptor_write.descriptorCount = 2;
 
+    // 2) The stateFlags don't match between the first and second descriptor
     m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, stateFlag_ErrorMessage);
     vkUpdateDescriptorSets(m_device->device(), 1, &descriptor_write, 0, NULL);
     m_errorMonitor->VerifyFound();
 
+    // 3) The second descriptor has a null_ptr pImmutableSamplers and
+    // the third descriptor contains an immutable sampler
     descriptor_write.dstBinding = 1;
     descriptor_write.descriptorType = VK_DESCRIPTOR_TYPE_SAMPLER;
+
+
+    // Make pImageInfo index non-null to avoid complaints of it missing
+    VkDescriptorImageInfo imageInfo = {};
+    imageInfo.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+    descriptor_write.pImageInfo = &imageInfo;
     m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, immutable_ErrorMessage);
     vkUpdateDescriptorSets(m_device->device(), 1, &descriptor_write, 0, NULL);
     m_errorMonitor->VerifyFound();