commit 4834cbaa8dc1641065106b40f562c64b61186b13
author Rene Lindsay <rene@lunarg.com> Thu Feb 02 17:18:56 2017 -0700
committer Jeremy Hayes <jeremy-lunarg@users.noreply.github.com> Wed Feb 08 14:04:32 2017 -0700
tree d59228d0af08923eec037e5f306360d2aaf34b6b
parent 1bf9b8f20b46351433bd0b087f32d455ab693081

tests: Fix InvalidBarriers

Change-Id: I4a2e6f43d55b77f3a40ff0cbf83b1ef1167a31c5

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index b2dbb2d..4caf7f6 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -8660,7 +8660,7 @@
     img_barrier.image = ds_image.handle();
 
     // Not having DEPTH or STENCIL set is an error
-    img_barrier.subresourceRange.aspectMask = 0;
+    img_barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_METADATA_BIT;
     vkCmdPipelineBarrier(m_commandBuffer->GetBufferHandle(), VK_PIPELINE_STAGE_HOST_BIT, VK_PIPELINE_STAGE_VERTEX_SHADER_BIT, 0, 0,
                          nullptr, 0, nullptr, 1, &img_barrier);
     m_errorMonitor->VerifyFound();
@@ -8688,7 +8688,7 @@
         // DEPTH bit must be set
         m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT,
                                              "Depth-only image formats must have the VK_IMAGE_ASPECT_DEPTH_BIT set.");
-        img_barrier.subresourceRange.aspectMask = 0;
+        img_barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_METADATA_BIT;
         vkCmdPipelineBarrier(m_commandBuffer->GetBufferHandle(), VK_PIPELINE_STAGE_HOST_BIT, VK_PIPELINE_STAGE_VERTEX_SHADER_BIT, 0,
                              0, nullptr, 0, nullptr, 1, &img_barrier);
         m_errorMonitor->VerifyFound();
@@ -8731,7 +8731,7 @@
     // COLOR bit must be set
     m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT,
                                          "Color image formats must have the VK_IMAGE_ASPECT_COLOR_BIT set.");
-    img_barrier.subresourceRange.aspectMask = 0;
+    img_barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_METADATA_BIT;
     vkCmdPipelineBarrier(m_commandBuffer->GetBufferHandle(), VK_PIPELINE_STAGE_HOST_BIT, VK_PIPELINE_STAGE_VERTEX_SHADER_BIT, 0, 0,
                          nullptr, 0, nullptr, 1, &img_barrier);
     m_errorMonitor->VerifyFound();