From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Fri, 11 May 2018 22:02:13 +0000 (-0700)
Subject: intel/blorp: Use linear formats for CCS_E clear colors in copies
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=18f8200a994440faa9fb9e80e99e8140ea912993;p=mesa.git

intel/blorp: Use linear formats for CCS_E clear colors in copies

It's clear that the original code meant to do this and there is even a
10-line comment explaining why.  Originally, we had a simple function
for packing the clear colors which was unaware of sRGB.  However, in
a6b66a7b26ae1, when we started using ISL to do the packing, the wrong
format was used.

Fixes: a6b66a7b26 "intel/blorp: Use ISL instead of bitcast_color..."
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
---

diff --git a/src/intel/blorp/blorp_blit.c b/src/intel/blorp/blorp_blit.c
index e825862d71a..26bf4426c0b 100644
--- a/src/intel/blorp/blorp_blit.c
+++ b/src/intel/blorp/blorp_blit.c
@@ -2562,7 +2562,7 @@ blorp_copy(struct blorp_batch *batch,
                                               params.src.view.format));
       uint32_t packed[4];
       isl_color_value_pack(&params.src.clear_color,
-                           params.src.surf.format, packed);
+                           linear_src_format, packed);
       isl_color_value_unpack(&params.src.clear_color,
                              params.src.view.format, packed);
    }
@@ -2576,7 +2576,7 @@ blorp_copy(struct blorp_batch *batch,
                                               params.dst.view.format));
       uint32_t packed[4];
       isl_color_value_pack(&params.dst.clear_color,
-                           params.dst.surf.format, packed);
+                           linear_dst_format, packed);
       isl_color_value_unpack(&params.dst.clear_color,
                              params.dst.view.format, packed);
    }