From d49d275c415d60ae08dc3e52d8db11f19a44010f Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 9 Feb 2017 12:00:51 -0800 Subject: [PATCH] anv/blorp: Don't sanitize the swizzle for blorp_clear BLORP is now smart enough to handle any swizzle (even those that contain ZERO or ONE) in a reasonable manner. Just let BLORP handle it. This fixes the following Vulkan CTS tests on Haswell: - dEQP-VK.api.image_clearing.clear_color_image.1d_b4g4r4a4_unorm_pack16 - dEQP-VK.api.image_clearing.clear_color_image.2d_b4g4r4a4_unorm_pack16 - dEQP-VK.api.image_clearing.clear_color_image.3d_b4g4r4a4_unorm_pack16 Reviewed-by: Juan A. Suarez Romero Cc: "17.0" --- src/intel/vulkan/anv_blorp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/intel/vulkan/anv_blorp.c b/src/intel/vulkan/anv_blorp.c index 759d2ae9444..4e7078bbfb3 100644 --- a/src/intel/vulkan/anv_blorp.c +++ b/src/intel/vulkan/anv_blorp.c @@ -832,8 +832,7 @@ void anv_CmdClearColorImage( } blorp_clear(&batch, &surf, - src_format.isl_format, - anv_swizzle_for_render(src_format.swizzle), + src_format.isl_format, src_format.swizzle, level, base_layer, layer_count, 0, 0, level_width, level_height, vk_to_isl_color(*pColor), color_write_disable); -- 2.30.2