From 1b03ebbab1791b4669d50343a59f8fa07fb62209 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Fri, 16 Jun 2017 16:42:35 -0700 Subject: Remove dead cmd_type param from PreCallRecordCmdClearImage --- layers/buffer_validation.cpp | 2 +- layers/buffer_validation.h | 2 +- layers/core_validation.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/layers/buffer_validation.cpp b/layers/buffer_validation.cpp index f7490aa6..7739fe08 100644 --- a/layers/buffer_validation.cpp +++ b/layers/buffer_validation.cpp @@ -1021,7 +1021,7 @@ bool PreCallValidateCmdClearColorImage(layer_data *dev_data, VkCommandBuffer com // This state recording routine is shared between ClearColorImage and ClearDepthStencilImage void PreCallRecordCmdClearImage(layer_data *dev_data, VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, - uint32_t rangeCount, const VkImageSubresourceRange *pRanges, CMD_TYPE cmd_type) { + uint32_t rangeCount, const VkImageSubresourceRange *pRanges) { auto cb_node = GetCBNode(dev_data, commandBuffer); auto image_state = GetImageState(dev_data, image); if (cb_node && image_state) { diff --git a/layers/buffer_validation.h b/layers/buffer_validation.h index db349f07..48eacaea 100644 --- a/layers/buffer_validation.h +++ b/layers/buffer_validation.h @@ -62,7 +62,7 @@ bool PreCallValidateCmdClearColorImage(layer_data *dev_data, VkCommandBuffer com VkImageLayout imageLayout, uint32_t rangeCount, const VkImageSubresourceRange *pRanges); void PreCallRecordCmdClearImage(layer_data *dev_data, VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, - uint32_t rangeCount, const VkImageSubresourceRange *pRanges, CMD_TYPE cmd_type); + uint32_t rangeCount, const VkImageSubresourceRange *pRanges); bool PreCallValidateCmdClearDepthStencilImage(layer_data *dev_data, VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, uint32_t rangeCount, diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 968c7027..5e59f4f2 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -6014,7 +6014,7 @@ VKAPI_ATTR void VKAPI_CALL CmdClearColorImage(VkCommandBuffer commandBuffer, VkI bool skip = PreCallValidateCmdClearColorImage(dev_data, commandBuffer, image, imageLayout, rangeCount, pRanges); if (!skip) { - PreCallRecordCmdClearImage(dev_data, commandBuffer, image, imageLayout, rangeCount, pRanges, CMD_CLEARCOLORIMAGE); + PreCallRecordCmdClearImage(dev_data, commandBuffer, image, imageLayout, rangeCount, pRanges); lock.unlock(); dev_data->dispatch_table.CmdClearColorImage(commandBuffer, image, imageLayout, pColor, rangeCount, pRanges); } @@ -6028,7 +6028,7 @@ VKAPI_ATTR void VKAPI_CALL CmdClearDepthStencilImage(VkCommandBuffer commandBuff bool skip = PreCallValidateCmdClearDepthStencilImage(dev_data, commandBuffer, image, imageLayout, rangeCount, pRanges); if (!skip) { - PreCallRecordCmdClearImage(dev_data, commandBuffer, image, imageLayout, rangeCount, pRanges, CMD_CLEARDEPTHSTENCILIMAGE); + PreCallRecordCmdClearImage(dev_data, commandBuffer, image, imageLayout, rangeCount, pRanges); lock.unlock(); dev_data->dispatch_table.CmdClearDepthStencilImage(commandBuffer, image, imageLayout, pDepthStencil, rangeCount, pRanges); } -- cgit v1.2.3