From d7c9a35ccfa7d14df790649adab666a5ea5c04eb Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Thu, 31 Mar 2016 11:47:29 +1300 Subject: [PATCH] layers: Fix the other half of #212 (bad error) Signed-off-by: Chris Forbes --- layers/core_validation.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index dcc20d5..f405bf2 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -5148,8 +5148,8 @@ bool validateCommandBufferSimultaneousUse(layer_data *dev_data, GLOBAL_CB_NODE * !(pCB->beginInfo.flags & VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT)) { skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, 0, - __LINE__, DRAWSTATE_INVALID_FENCE, "DS", "Command Buffer %#" PRIx64 " is already in use and is not marked " - "for simultaneous use.", + __LINE__, DRAWSTATE_INVALID_CB_SIMULTANEOUS_USE, "DS", + "Command Buffer %#" PRIx64 " is already in use and is not marked for simultaneous use.", reinterpret_cast(pCB->commandBuffer)); } return skip_call; @@ -8732,8 +8732,8 @@ bool validateEventStageMask(VkQueue queue, GLOBAL_CB_NODE *pCB, uint32_t eventCo auto global_event_data = dev_data->eventMap.find(event); if (global_event_data == dev_data->eventMap.end()) { skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_EVENT_EXT, - reinterpret_cast(event), __LINE__, DRAWSTATE_INVALID_FENCE, "DS", - "Fence 0x%" PRIx64 " cannot be waited on if it has never been set.", + reinterpret_cast(event), __LINE__, DRAWSTATE_INVALID_EVENT, "DS", + "Event 0x%" PRIx64 " cannot be waited on if it has never been set.", reinterpret_cast(event)); } else { stageMask |= global_event_data->second.stageMask; @@ -8743,7 +8743,7 @@ bool validateEventStageMask(VkQueue queue, GLOBAL_CB_NODE *pCB, uint32_t eventCo if (sourceStageMask != stageMask) { skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, (VkDebugReportObjectTypeEXT)0, 0, __LINE__, - DRAWSTATE_INVALID_FENCE, "DS", + DRAWSTATE_INVALID_EVENT, "DS", "Submitting cmdbuffer with call to VkCmdWaitEvents using srcStageMask 0x%x which must be the bitwise OR of the " "stageMask parameters used in calls to vkCmdSetEvent and VK_PIPELINE_STAGE_HOST_BIT if used with vkSetEvent.", sourceStageMask); -- 2.7.4