commit d46dcb505a99a3bd5bb20fbb4a2e9a7246f291c2
author Cort Stratton <cort@google.com> Tue Apr 10 14:52:49 2018 -0700
committer Cort <1944792+cdwfs@users.noreply.github.com> Tue Apr 10 19:06:56 2018 -0700
tree a3747bb2a1bcb6819a4a9f668a22e577fa711d77
parent 152ab5e1a290bebdd8f83eda9bda6d5c2125010f

layers: use VUID in ValidateImageAspectLayout log msg

This commit also updates the corresponding test to expect
the VUID instead of a log message snippet.

layers/buffer_validation.cpp

diff --git a/layers/buffer_validation.cpp b/layers/buffer_validation.cpp
index 2c72c4f..b0dddba 100644
--- a/layers/buffer_validation.cpp
+++ b/layers/buffer_validation.cpp
@@ -387,13 +387,13 @@
     if (mem_barrier->oldLayout == VK_IMAGE_LAYOUT_UNDEFINED) {
         // TODO: Set memory invalid which is in mem_tracker currently
     } else if (node.layout != mem_barrier->oldLayout) {
-        skip |= log_msg(core_validation::GetReportData(device_data), VK_DEBUG_REPORT_ERROR_BIT_EXT,
-                        VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, HandleToUint64(pCB->commandBuffer),
-                        DRAWSTATE_INVALID_IMAGE_LAYOUT,
-                        "For image 0x%" PRIx64
-                        " you cannot transition the layout of aspect=%d level=%d layer=%d from %s when current layout is %s.",
-                        HandleToUint64(mem_barrier->image), aspect, level, layer, string_VkImageLayout(mem_barrier->oldLayout),
-                        string_VkImageLayout(node.layout));
+        skip =
+            log_msg(core_validation::GetReportData(device_data), VK_DEBUG_REPORT_ERROR_BIT_EXT,
+                    VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, HandleToUint64(pCB->commandBuffer), VALIDATION_ERROR_0a00095a,
+                    "For image 0x%" PRIx64
+                    " you cannot transition the layout of aspect=%d level=%d layer=%d from %s when current layout is %s.",
+                    HandleToUint64(mem_barrier->image), aspect, level, layer, string_VkImageLayout(mem_barrier->oldLayout),
+                    string_VkImageLayout(node.layout));
     }
     return skip;
 }