From 4cfb4e2ad89d0a1c0d6e69de3b5460e35c1196b1 Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Fri, 27 Jan 2017 15:16:01 -0700 Subject: layers: Migrate image layer CmdClearColorImage The image layer checks for this API were moved to the buffer_validation module and a call was added to CV. Change-Id: I04b23843519d2354c952afebc3a3428b196339e3 --- layers/image.cpp | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) (limited to 'layers/image.cpp') diff --git a/layers/image.cpp b/layers/image.cpp index 25c67c5d..41108936 100644 --- a/layers/image.cpp +++ b/layers/image.cpp @@ -241,51 +241,6 @@ VKAPI_ATTR void VKAPI_CALL DestroyImage(VkDevice device, VkImage image, const Vk device_data->device_dispatch_table->DestroyImage(device, image, pAllocator); } -VKAPI_ATTR void VKAPI_CALL CmdClearColorImage(VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, - const VkClearColorValue *pColor, uint32_t rangeCount, - const VkImageSubresourceRange *pRanges) { - bool skipCall = false; - layer_data *device_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); - - // For each range, image aspect must be color only - // TODO: this is a 'must' in the spec, so there should be a VU enum for it - for (uint32_t i = 0; i < rangeCount; i++) { - if (pRanges[i].aspectMask != VK_IMAGE_ASPECT_COLOR_BIT) { - char const str[] = - "vkCmdClearColorImage aspectMasks for all subresource ranges must be set to VK_IMAGE_ASPECT_COLOR_BIT"; - skipCall |= - log_msg(device_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, - (uint64_t)commandBuffer, __LINE__, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", str); - } - } - - auto image_state = getImageState(device_data, image); - if (image_state) { - if (vk_format_is_depth_or_stencil(image_state->format)) { - char const str[] = "vkCmdClearColorImage called with depth/stencil image."; - skipCall |= log_msg(device_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, - reinterpret_cast(image), __LINE__, VALIDATION_ERROR_01088, "IMAGE", "%s. %s", str, - validation_error_map[VALIDATION_ERROR_01088]); - } else if (vk_format_is_compressed(image_state->format)) { - char const str[] = "vkCmdClearColorImage called with compressed image."; - skipCall |= log_msg(device_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, - reinterpret_cast(image), __LINE__, VALIDATION_ERROR_01088, "IMAGE", "%s. %s", str, - validation_error_map[VALIDATION_ERROR_01088]); - } - - if (!(image_state->usage & VK_IMAGE_USAGE_TRANSFER_DST_BIT)) { - char const str[] = "vkCmdClearColorImage called with image created without VK_IMAGE_USAGE_TRANSFER_DST_BIT."; - skipCall |= log_msg(device_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, - reinterpret_cast(image), __LINE__, VALIDATION_ERROR_01084, "IMAGE", "%s. %s", str, - validation_error_map[VALIDATION_ERROR_01084]); - } - } - - if (!skipCall) { - device_data->device_dispatch_table->CmdClearColorImage(commandBuffer, image, imageLayout, pColor, rangeCount, pRanges); - } -} - VKAPI_ATTR void VKAPI_CALL CmdClearDepthStencilImage(VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue *pDepthStencil, uint32_t rangeCount, const VkImageSubresourceRange *pRanges) { @@ -1151,7 +1106,6 @@ static PFN_vkVoidFunction intercept_core_device_command(const char *name) { {"vkDestroyDevice", reinterpret_cast(DestroyDevice)}, {"vkCreateImage", reinterpret_cast(CreateImage)}, {"vkDestroyImage", reinterpret_cast(DestroyImage)}, - {"vkCmdClearColorImage", reinterpret_cast(CmdClearColorImage)}, {"vkCmdClearDepthStencilImage", reinterpret_cast(CmdClearDepthStencilImage)}, {"vkCmdClearAttachments", reinterpret_cast(CmdClearAttachments)}, {"vkCmdCopyImage", reinterpret_cast(CmdCopyImage)}, -- cgit v1.2.3