diff options
| author | Tobin Ehlis <tobine@google.com> | 2016-12-19 15:16:37 -0700 |
|---|---|---|
| committer | Tobin Ehlis <tobine@google.com> | 2016-12-23 10:00:06 -0700 |
| commit | 84db1ea2be2983093b16f402d5bb73ca752a8cab (patch) | |
| tree | bc949ab549e3cbda2e47b2859d0c0fa340e9ffe6 /layers | |
| parent | 994aa745bbe809574af9fceab3eaa0f3911a6745 (diff) | |
| download | usermoji-84db1ea2be2983093b16f402d5bb73ca752a8cab.tar.xz | |
layers:Remove unneeded return value
MarkStoreImagesAndBuffersAsWritten() only updates state and the return
value was a constant false. Update function to remove the return value.
Diffstat (limited to 'layers')
| -rw-r--r-- | layers/core_validation.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index bf10e32e..1eb45bc7 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -7984,9 +7984,7 @@ VKAPI_ATTR void VKAPI_CALL CmdBindVertexBuffers(VkCommandBuffer commandBuffer, u } /* expects global_lock to be held by caller */ -static bool markStoreImagesAndBuffersAsWritten(layer_data *dev_data, GLOBAL_CB_NODE *pCB) { - bool skip_call = false; - +static void MarkStoreImagesAndBuffersAsWritten(layer_data *dev_data, GLOBAL_CB_NODE *pCB) { for (auto imageView : pCB->updateImages) { auto view_state = getImageViewState(dev_data, imageView); if (!view_state) @@ -8009,7 +8007,6 @@ static bool markStoreImagesAndBuffersAsWritten(layer_data *dev_data, GLOBAL_CB_N }; pCB->validate_functions.push_back(function); } - return skip_call; } VKAPI_ATTR void VKAPI_CALL CmdDraw(VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t instanceCount, @@ -8022,7 +8019,7 @@ VKAPI_ATTR void VKAPI_CALL CmdDraw(VkCommandBuffer commandBuffer, uint32_t verte skip_call |= addCmd(dev_data, pCB, CMD_DRAW, "vkCmdDraw()"); pCB->drawCount[DRAW]++; skip_call |= validate_and_update_draw_state(dev_data, pCB, false, VK_PIPELINE_BIND_POINT_GRAPHICS, "vkCmdDraw"); - skip_call |= markStoreImagesAndBuffersAsWritten(dev_data, pCB); + 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, @@ -8050,7 +8047,7 @@ VKAPI_ATTR void VKAPI_CALL CmdDrawIndexed(VkCommandBuffer commandBuffer, uint32_ skip_call |= addCmd(dev_data, pCB, CMD_DRAWINDEXED, "vkCmdDrawIndexed()"); pCB->drawCount[DRAW_INDEXED]++; skip_call |= validate_and_update_draw_state(dev_data, pCB, true, VK_PIPELINE_BIND_POINT_GRAPHICS, "vkCmdDrawIndexed"); - skip_call |= markStoreImagesAndBuffersAsWritten(dev_data, pCB); + 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", @@ -8081,7 +8078,7 @@ CmdDrawIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize off skip_call |= addCmd(dev_data, cb_node, CMD_DRAWINDIRECT, "vkCmdDrawIndirect()"); cb_node->drawCount[DRAW_INDIRECT]++; skip_call |= validate_and_update_draw_state(dev_data, cb_node, false, VK_PIPELINE_BIND_POINT_GRAPHICS, "vkCmdDrawIndirect"); - skip_call |= markStoreImagesAndBuffersAsWritten(dev_data, cb_node); + 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", @@ -8115,7 +8112,7 @@ CmdDrawIndexedIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceS cb_node->drawCount[DRAW_INDEXED_INDIRECT]++; skip_call |= validate_and_update_draw_state(dev_data, cb_node, true, VK_PIPELINE_BIND_POINT_GRAPHICS, "vkCmdDrawIndexedIndirect"); - skip_call |= markStoreImagesAndBuffersAsWritten(dev_data, cb_node); + 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, @@ -8141,7 +8138,7 @@ VKAPI_ATTR void VKAPI_CALL CmdDispatch(VkCommandBuffer commandBuffer, uint32_t x GLOBAL_CB_NODE *pCB = getCBNode(dev_data, commandBuffer); if (pCB) { skip_call |= validate_and_update_draw_state(dev_data, pCB, false, VK_PIPELINE_BIND_POINT_COMPUTE, "vkCmdDispatch"); - skip_call |= markStoreImagesAndBuffersAsWritten(dev_data, pCB); + MarkStoreImagesAndBuffersAsWritten(dev_data, pCB); skip_call |= addCmd(dev_data, pCB, CMD_DISPATCH, "vkCmdDispatch()"); skip_call |= insideRenderPass(dev_data, pCB, "vkCmdDispatch()", VALIDATION_ERROR_01562); } @@ -8163,7 +8160,7 @@ CmdDispatchIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize AddCommandBufferBindingBuffer(dev_data, cb_node, buffer_state); skip_call |= validate_and_update_draw_state(dev_data, cb_node, false, VK_PIPELINE_BIND_POINT_COMPUTE, "vkCmdDispatchIndirect"); - skip_call |= markStoreImagesAndBuffersAsWritten(dev_data, cb_node); + MarkStoreImagesAndBuffersAsWritten(dev_data, cb_node); skip_call |= addCmd(dev_data, cb_node, CMD_DISPATCHINDIRECT, "vkCmdDispatchIndirect()"); skip_call |= insideRenderPass(dev_data, cb_node, "vkCmdDispatchIndirect()", VALIDATION_ERROR_01569); } |
