diff options
| author | Tobin Ehlis <tobine@google.com> | 2016-12-19 15:20:53 -0700 |
|---|---|---|
| committer | Tobin Ehlis <tobine@google.com> | 2016-12-23 10:00:06 -0700 |
| commit | f5fa44006db86217d79ced17e29ac9cc49546239 (patch) | |
| tree | a7b48468ac0721b6d058640b36dfb6b63eec4139 | |
| parent | 84db1ea2be2983093b16f402d5bb73ca752a8cab (diff) | |
| download | usermoji-f5fa44006db86217d79ced17e29ac9cc49546239.tar.xz | |
layers:Pass cmd buffer as log_msg object
Fix some old TODOs where cmdBuffer was not being correctly passed into
log_msg as the src object.
| -rw-r--r-- | layers/core_validation.cpp | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 1eb45bc7..f23900fb 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -8020,11 +8020,10 @@ VKAPI_ATTR void VKAPI_CALL CmdDraw(VkCommandBuffer commandBuffer, uint32_t verte pCB->drawCount[DRAW]++; skip_call |= validate_and_update_draw_state(dev_data, pCB, false, VK_PIPELINE_BIND_POINT_GRAPHICS, "vkCmdDraw"); MarkStoreImagesAndBuffersAsWritten(dev_data, pCB); - // TODO : Need to pass commandBuffer as srcObj here skip_call |= - log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, 0, - __LINE__, DRAWSTATE_NONE, "DS", "vkCmdDraw() call 0x%" PRIx64 ", reporting descriptor set state:", - g_drawCount[DRAW]++); + log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, + reinterpret_cast<uint64_t &>(commandBuffer), __LINE__, DRAWSTATE_NONE, "DS", + "vkCmdDraw() call 0x%" PRIx64 ", reporting descriptor set state:", g_drawCount[DRAW]++); skip_call |= synchAndPrintDSConfig(dev_data, commandBuffer); if (!skip_call) { updateResourceTrackingOnDraw(pCB); @@ -8048,11 +8047,10 @@ VKAPI_ATTR void VKAPI_CALL CmdDrawIndexed(VkCommandBuffer commandBuffer, uint32_ pCB->drawCount[DRAW_INDEXED]++; skip_call |= validate_and_update_draw_state(dev_data, pCB, true, VK_PIPELINE_BIND_POINT_GRAPHICS, "vkCmdDrawIndexed"); MarkStoreImagesAndBuffersAsWritten(dev_data, pCB); - // TODO : Need to pass commandBuffer as srcObj here - skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, - VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, 0, __LINE__, DRAWSTATE_NONE, "DS", - "vkCmdDrawIndexed() call 0x%" PRIx64 ", reporting descriptor set state:", - g_drawCount[DRAW_INDEXED]++); + skip_call |= + log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, + reinterpret_cast<uint64_t &>(commandBuffer), __LINE__, DRAWSTATE_NONE, "DS", + "vkCmdDrawIndexed() call 0x%" PRIx64 ", reporting descriptor set state:", g_drawCount[DRAW_INDEXED]++); skip_call |= synchAndPrintDSConfig(dev_data, commandBuffer); if (!skip_call) { updateResourceTrackingOnDraw(pCB); @@ -8079,11 +8077,10 @@ CmdDrawIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize off cb_node->drawCount[DRAW_INDIRECT]++; skip_call |= validate_and_update_draw_state(dev_data, cb_node, false, VK_PIPELINE_BIND_POINT_GRAPHICS, "vkCmdDrawIndirect"); MarkStoreImagesAndBuffersAsWritten(dev_data, cb_node); - // TODO : Need to pass commandBuffer as srcObj here - skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, - VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, 0, __LINE__, DRAWSTATE_NONE, "DS", - "vkCmdDrawIndirect() call 0x%" PRIx64 ", reporting descriptor set state:", - g_drawCount[DRAW_INDIRECT]++); + skip_call |= + log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, + reinterpret_cast<uint64_t &>(commandBuffer), __LINE__, DRAWSTATE_NONE, "DS", + "vkCmdDrawIndirect() call 0x%" PRIx64 ", reporting descriptor set state:", g_drawCount[DRAW_INDIRECT]++); skip_call |= synchAndPrintDSConfig(dev_data, commandBuffer); if (!skip_call) { updateResourceTrackingOnDraw(cb_node); @@ -8113,11 +8110,10 @@ CmdDrawIndexedIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceS skip_call |= validate_and_update_draw_state(dev_data, cb_node, true, VK_PIPELINE_BIND_POINT_GRAPHICS, "vkCmdDrawIndexedIndirect"); MarkStoreImagesAndBuffersAsWritten(dev_data, cb_node); - // TODO : Need to pass commandBuffer as srcObj here - skip_call |= - log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, 0, - __LINE__, DRAWSTATE_NONE, "DS", "vkCmdDrawIndexedIndirect() call 0x%" PRIx64 ", reporting descriptor set state:", - g_drawCount[DRAW_INDEXED_INDIRECT]++); + skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, + VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, reinterpret_cast<uint64_t &>(commandBuffer), __LINE__, + DRAWSTATE_NONE, "DS", "vkCmdDrawIndexedIndirect() call 0x%" PRIx64 ", reporting descriptor set state:", + g_drawCount[DRAW_INDEXED_INDIRECT]++); skip_call |= synchAndPrintDSConfig(dev_data, commandBuffer); if (!skip_call) { updateResourceTrackingOnDraw(cb_node); |