diff options
| author | Tobin Ehlis <tobine@google.com> | 2017-07-13 13:07:39 -0600 |
|---|---|---|
| committer | Tobin Ehlis <tobine@google.com> | 2017-07-17 11:39:28 -0600 |
| commit | 13b8d0eaebec46b4428690a92781b1d41aab2e11 (patch) | |
| tree | bac998897e56d302fa24f2fe2988a7fbb13ca49a /layers/core_validation.cpp | |
| parent | 4487010f1e803e8417198c5f2e44b908329926e1 (diff) | |
| download | usermoji-13b8d0eaebec46b4428690a92781b1d41aab2e11.tar.xz | |
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.
Diffstat (limited to 'layers/core_validation.cpp')
| -rw-r--r-- | layers/core_validation.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
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) { |