From a7b579f9b999ea3019b83ed346cef54db7ec0c92 Mon Sep 17 00:00:00 2001 From: Cort Stratton Date: Tue, 10 Apr 2018 14:52:49 -0700 Subject: 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 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'layers/buffer_validation.cpp') diff --git a/layers/buffer_validation.cpp b/layers/buffer_validation.cpp index 2c72c4f5..b0dddba6 100644 --- a/layers/buffer_validation.cpp +++ b/layers/buffer_validation.cpp @@ -387,13 +387,13 @@ bool ValidateImageAspectLayout(layer_data *device_data, GLOBAL_CB_NODE const *pC 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; } -- cgit v1.2.3