commit d2b5fe46c137728ad8e3e89a564ec6e28457994d
author Chris Forbes <chrisforbes@google.com> Mon Nov 28 18:00:00 2016 +1300
committer Chris Forbes <chrisforbes@google.com> Tue Nov 29 08:31:01 2016 +1300
tree cee9ebe7e67efe6eadf2258c990ed0bcf32bd06b
parent 9842038ec96dfbe593065b66817fe71036bd3e86

tests: use consistent format for image+view in InvalidUsageBits

Signed-off-by: Chris Forbes <chrisforbes@google.com>

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index b2e7499..a440bc0 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -1940,9 +1940,12 @@
     m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, "Invalid usage flag for image ");
 
     ASSERT_NO_FATAL_FAILURE(InitState());
+
+    auto format = VK_FORMAT_D24_UNORM_S8_UINT;
+
     VkImageObj image(m_device);
     // Initialize image with USAGE_TRANSIENT_ATTACHMENT
-    image.init(128, 128, VK_FORMAT_D24_UNORM_S8_UINT, VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT, VK_IMAGE_TILING_OPTIMAL, 0);
+    image.init(128, 128, format, VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT, VK_IMAGE_TILING_OPTIMAL, 0);
     ASSERT_TRUE(image.initialized());
 
     VkImageView dsv;
@@ -1950,7 +1953,7 @@
     dsvci.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
     dsvci.image = image.handle();
     dsvci.viewType = VK_IMAGE_VIEW_TYPE_2D;
-    dsvci.format = VK_FORMAT_D32_SFLOAT_S8_UINT;
+    dsvci.format = format;
     dsvci.subresourceRange.layerCount = 1;
     dsvci.subresourceRange.baseMipLevel = 0;
     dsvci.subresourceRange.levelCount = 1;