From 13b8d0eaebec46b4428690a92781b1d41aab2e11 Mon Sep 17 00:00:00 2001 From: Tobin Ehlis Date: Thu, 13 Jul 2017 13:07:39 -0600 Subject: layers:Add subpass barrier self-dependency VUID This is VALIDATION_ERROR_1b800928. Add the ID and slightly touch up the error language. Also, this check should be general for any barrier that's inserted for a renderPass so remove extra memBarrierCount condition. --- layers/core_validation.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'layers/core_validation.cpp') diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 87fa6c7d..e9e23e21 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -6150,13 +6150,14 @@ static bool ValidateBarriers(const char *funcName, VkCommandBuffer cmdBuffer, ui bool skip = false; layer_data *dev_data = GetLayerDataPtr(get_dispatch_key(cmdBuffer), layer_data_map); GLOBAL_CB_NODE *pCB = GetCBNode(dev_data, cmdBuffer); - if (pCB->activeRenderPass && memBarrierCount) { + if (pCB->activeRenderPass) { if (!pCB->activeRenderPass->hasSelfDependency[pCB->activeSubpass]) { + auto rp_handle = HandleToUint64(pCB->activeRenderPass->renderPass); skip |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, - HandleToUint64(cmdBuffer), __LINE__, DRAWSTATE_INVALID_BARRIER, "DS", - "%s: Barriers cannot be set during subpass %d " - "with no self dependency specified.", - funcName, pCB->activeSubpass); + rp_handle, __LINE__, VALIDATION_ERROR_1b800928, "CORE", + "%s: Barriers cannot be set during subpass %d of renderPass 0x%" PRIx64 + "with no self-dependency specified. %s", + funcName, pCB->activeSubpass, rp_handle, validation_error_map[VALIDATION_ERROR_1b800928]); } } for (uint32_t i = 0; i < imageMemBarrierCount; ++i) { -- cgit v1.2.3