From cfb77988ccd84f9daa0644bcbc46b7bb3c5d94b9 Mon Sep 17 00:00:00 2001 From: Tobin Ehlis Date: Tue, 4 Apr 2017 12:23:48 -0600 Subject: scripts:Update unique IDs for spec v1.0.45.1 Another massive update. Totally overhauled the mapping algorithm. The basic outline of the new algorithm is: -Try to map complete error message to prev ID -Then try to map error msg w/o link to prev ID -Finally try to map just core error string (no section) to prev ID -Else assign it a new unique ID See code for complete details. In anticipation of integrated uniqueIDs I took a little liberty with this update in that I didn't attempt to remap EVERY new ID to previous IDs. I did many of them and made sure to account for every previous ID that was implemented. IDs will all be undergoing a one-time change with their integration into the spec anyway so there is little harm in letting non-implemented IDs drift a bit for now and it helps save my sanity. I did add a validation step to the spec.py script to make sure and flag any IDs that previously were implemented and suddenly are no longer in the re-mapped version of IDs. I manually presevered IDs 911 & 912 which get masked from the extension spec. I also had to do some manual updates on an offline spec to keep the parser from breaking on the non-xhtml compliant spec. Command line was: python spec.py -update -remap 92-72:97-77:112-92:116-96:123-103:124-105: 133-114:148-2349:154-133,2:156-135:157-139:204-156:205-155:206-154: 417-269:1189-769:1417-938:1446-965:1448-967:1449-968:1487-974: 2193-1430,5:683-496:684-494:728-529:729-527:1628-1086:1731-1180: 1736-1183:1796-1234:1815-1251 --- layers/core_validation.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'layers/core_validation.cpp') diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index eea62c4f..5f949eae 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -6909,10 +6909,10 @@ VKAPI_ATTR VkResult VKAPI_CALL BeginCommandBuffer(VkCommandBuffer commandBuffer, if (dev_data->globalInFlightCmdBuffers.count(commandBuffer)) { skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, - (uint64_t)commandBuffer, __LINE__, VALIDATION_ERROR_00104, "MEM", + (uint64_t)commandBuffer, __LINE__, VALIDATION_ERROR_00103, "MEM", "Calling vkBeginCommandBuffer() on active command buffer 0x%p before it has completed. " "You must check command buffer fence before this call. %s", - commandBuffer, validation_error_map[VALIDATION_ERROR_00104]); + commandBuffer, validation_error_map[VALIDATION_ERROR_00103]); } clear_cmd_buf_and_mem_references(dev_data, cb_node); if (cb_node->createInfo.level != VK_COMMAND_BUFFER_LEVEL_PRIMARY) { @@ -9915,10 +9915,10 @@ VKAPI_ATTR void VKAPI_CALL CmdExecuteCommands(VkCommandBuffer commandBuffer, uin if (VK_COMMAND_BUFFER_LEVEL_PRIMARY == pSubCB->createInfo.level) { skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, - reinterpret_cast(pCommandBuffers[i]), __LINE__, VALIDATION_ERROR_00153, "DS", + reinterpret_cast(pCommandBuffers[i]), __LINE__, VALIDATION_ERROR_00156, "DS", "vkCmdExecuteCommands() called w/ Primary Cmd Buffer 0x%p in element %u of pCommandBuffers " "array. All cmd buffers in pCommandBuffers array must be secondary. %s", - pCommandBuffers[i], i, validation_error_map[VALIDATION_ERROR_00153]); + pCommandBuffers[i], i, validation_error_map[VALIDATION_ERROR_00156]); } else if (pCB->activeRenderPass) { // Secondary CB w/i RenderPass must have *CONTINUE_BIT set auto secondary_rp_state = GetRenderPassState(dev_data, pSubCB->beginInfo.pInheritanceInfo->renderPass); if (!(pSubCB->beginInfo.flags & VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT)) { -- cgit v1.2.3