From a95f372043b1075b1382a578e2194918a7454268 Mon Sep 17 00:00:00 2001 From: Tobin Ehlis Date: Thu, 22 Dec 2016 11:00:07 -0700 Subject: [PATCH] layers:Fix unique error enum ResetCommandBuffer valid commandBuffer handle is id *00094, not *00090. This was causing 90, which is for allocation, to be incorrectly reused. --- layers/object_tracker.cpp | 2 +- layers/vk_validation_error_database.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/layers/object_tracker.cpp b/layers/object_tracker.cpp index fc68e12..8a47dd2 100644 --- a/layers/object_tracker.cpp +++ b/layers/object_tracker.cpp @@ -1835,7 +1835,7 @@ VKAPI_ATTR VkResult VKAPI_CALL ResetCommandBuffer(VkCommandBuffer commandBuffer, { std::lock_guard lock(global_lock); skip_call |= ValidateObject(commandBuffer, commandBuffer, VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, false, - VALIDATION_ERROR_00090); + VALIDATION_ERROR_00094); } if (skip_call) { return VK_ERROR_VALIDATION_FAILED_EXT; diff --git a/layers/vk_validation_error_database.txt b/layers/vk_validation_error_database.txt index 06f385c..465c7af 100644 --- a/layers/vk_validation_error_database.txt +++ b/layers/vk_validation_error_database.txt @@ -97,7 +97,7 @@ VALIDATION_ERROR_00090~^~Y~^~None~^~vkAllocateCommandBuffers~^~For more informat VALIDATION_ERROR_00091~^~U~^~Unknown~^~vkAllocateCommandBuffers~^~For more information refer to Vulkan Spec Section '5.2. Command Buffer Allocation and Management' which states 'level must be a valid VkCommandBufferLevel value' (https://www.khronos.org/registry/vulkan/specs/1.0-extensions/xhtml/vkspec.html#VkCommandBufferLevel)~^~ VALIDATION_ERROR_00092~^~Y~^~CommandBufferResetErrors~^~vkResetCommandBuffer~^~For more information refer to Vulkan Spec Section '5.2. Command Buffer Allocation and Management' which states 'commandBuffer must not currently be pending execution' (https://www.khronos.org/registry/vulkan/specs/1.0-extensions/xhtml/vkspec.html#VkCommandBufferResetFlagBits)~^~ VALIDATION_ERROR_00093~^~U~^~Unknown~^~vkResetCommandBuffer~^~For more information refer to Vulkan Spec Section '5.2. Command Buffer Allocation and Management' which states 'commandBuffer must have been allocated from a pool that was created with the VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT' (https://www.khronos.org/registry/vulkan/specs/1.0-extensions/xhtml/vkspec.html#VkCommandBufferResetFlagBits)~^~ -VALIDATION_ERROR_00094~^~U~^~Unknown~^~vkResetCommandBuffer~^~For more information refer to Vulkan Spec Section '5.2. Command Buffer Allocation and Management' which states 'commandBuffer must be a valid VkCommandBuffer handle' (https://www.khronos.org/registry/vulkan/specs/1.0-extensions/xhtml/vkspec.html#VkCommandBufferResetFlagBits)~^~ +VALIDATION_ERROR_00094~^~Y~^~Unknown~^~vkResetCommandBuffer~^~For more information refer to Vulkan Spec Section '5.2. Command Buffer Allocation and Management' which states 'commandBuffer must be a valid VkCommandBuffer handle' (https://www.khronos.org/registry/vulkan/specs/1.0-extensions/xhtml/vkspec.html#VkCommandBufferResetFlagBits)~^~ VALIDATION_ERROR_00095~^~N~^~Unknown~^~vkResetCommandBuffer~^~For more information refer to Vulkan Spec Section '5.2. Command Buffer Allocation and Management' which states 'flags must be a valid combination of VkCommandBufferResetFlagBits values' (https://www.khronos.org/registry/vulkan/specs/1.0-extensions/xhtml/vkspec.html#VkCommandBufferResetFlagBits)~^~TBD in parameter validation layer. VALIDATION_ERROR_00096~^~Y~^~None~^~vkFreeCommandBuffers~^~For more information refer to Vulkan Spec Section '5.2. Command Buffer Allocation and Management' which states 'All elements of pCommandBuffers must not be pending execution' (https://www.khronos.org/registry/vulkan/specs/1.0-extensions/xhtml/vkspec.html#vkFreeCommandBuffers)~^~ VALIDATION_ERROR_00097~^~Y~^~Unknown~^~vkFreeCommandBuffers~^~For more information refer to Vulkan Spec Section '5.2. Command Buffer Allocation and Management' which states 'pCommandBuffers must be a pointer to an array of commandBufferCount VkCommandBuffer handles, each element of which must either be a valid handle or NULL' (https://www.khronos.org/registry/vulkan/specs/1.0-extensions/xhtml/vkspec.html#vkFreeCommandBuffers)~^~ -- 2.7.4