Mesa (master): anv/blorp: Don't sanitize the swizzle for blorp_clear

[Jason Ekstrand]

Module: Mesa
Branch: master
Commit: d49d275c415d60ae08dc3e52d8db11f19a44010f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d49d275c415d60ae08dc3e52d8db11f19a44010f

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Thu Feb  9 12:00:51 2017 -0800

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 <jasuarez at igalia.com>
Cc: "17.0" <mesa-stable at lists.freedesktop.org>

---

 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 759d2ae..4e7078b 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);