From: Jason Ekstrand <jason@jlekstrand.net>
Date: Wed, 4 Mar 2020 20:26:43 +0000 (-0600)
Subject: intel/blorp: Allow HIZ_CCS_WT in copy sources
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e13ed0e9e548c99e484e9533b0030ce555465fd7;p=mesa.git

intel/blorp: Allow HIZ_CCS_WT in copy sources

Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4056>
---

diff --git a/src/intel/blorp/blorp_blit.c b/src/intel/blorp/blorp_blit.c
index cff57a356ac..491d393ee5c 100644
--- a/src/intel/blorp/blorp_blit.c
+++ b/src/intel/blorp/blorp_blit.c
@@ -2674,11 +2674,12 @@ blorp_copy(struct blorp_batch *batch,
 
    assert(params.src.aux_usage == ISL_AUX_USAGE_NONE ||
           params.src.aux_usage == ISL_AUX_USAGE_HIZ ||
+          params.src.aux_usage == ISL_AUX_USAGE_HIZ_CCS_WT ||
           params.src.aux_usage == ISL_AUX_USAGE_MCS ||
           params.src.aux_usage == ISL_AUX_USAGE_MCS_CCS ||
           params.src.aux_usage == ISL_AUX_USAGE_CCS_E);
 
-   if (params.src.aux_usage == ISL_AUX_USAGE_HIZ) {
+   if (isl_aux_usage_has_hiz(params.src.aux_usage)) {
       /* In order to use HiZ, we have to use the real format for the source.
        * Depth <-> Color copies are not allowed.
        */