From f26b008e283ee11cfeeb4efb61ce435a04b04b2f Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Mon, 21 May 2018 01:31:49 +0200 Subject: [PATCH] radv: Cleanup unused prime blit path. Since we have the common WSI code, we use vkCmdCopyImageToBuffer instead. Reviewed-by: Dave Airlie Reviewed-by: Jason Ekstrand --- src/amd/vulkan/radv_meta.h | 4 ---- src/amd/vulkan/radv_meta_copy.c | 21 --------------------- 2 files changed, 25 deletions(-) diff --git a/src/amd/vulkan/radv_meta.h b/src/amd/vulkan/radv_meta.h index 4a9abae30ac..35067f67124 100644 --- a/src/amd/vulkan/radv_meta.h +++ b/src/amd/vulkan/radv_meta.h @@ -199,10 +199,6 @@ void radv_decompress_resolve_src(struct radv_cmd_buffer *cmd_buffer, uint32_t region_count, const VkImageResolve *regions); -void radv_blit_to_prime_linear(struct radv_cmd_buffer *cmd_buffer, - struct radv_image *image, - struct radv_image *linear_image); - uint32_t radv_clear_cmask(struct radv_cmd_buffer *cmd_buffer, struct radv_image *image, uint32_t value); uint32_t radv_clear_dcc(struct radv_cmd_buffer *cmd_buffer, diff --git a/src/amd/vulkan/radv_meta_copy.c b/src/amd/vulkan/radv_meta_copy.c index a4d35982661..3442b49fb9c 100644 --- a/src/amd/vulkan/radv_meta_copy.c +++ b/src/amd/vulkan/radv_meta_copy.c @@ -486,24 +486,3 @@ void radv_CmdCopyImage( dest_image, destImageLayout, regionCount, pRegions); } - -void radv_blit_to_prime_linear(struct radv_cmd_buffer *cmd_buffer, - struct radv_image *image, - struct radv_image *linear_image) -{ - struct VkImageCopy image_copy = { 0 }; - - image_copy.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; - image_copy.srcSubresource.layerCount = 1; - - image_copy.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; - image_copy.dstSubresource.layerCount = 1; - - image_copy.extent.width = image->info.width; - image_copy.extent.height = image->info.height; - image_copy.extent.depth = 1; - - meta_copy_image(cmd_buffer, image, VK_IMAGE_LAYOUT_GENERAL, linear_image, - VK_IMAGE_LAYOUT_GENERAL, - 1, &image_copy); -} -- 2.11.0