intel/blorp: Allow HIZ_CCS_WT in copy sources
authorJason Ekstrand <jason@jlekstrand.net>
Wed, 4 Mar 2020 20:26:43 +0000 (14:26 -0600)
committerMarge Bot <eric+marge@anholt.net>
Thu, 12 Mar 2020 17:51:28 +0000 (17:51 +0000)
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4056>

src/intel/blorp/blorp_blit.c

index cff57a356acf94cdc772dece42ca789e31501fd1..491d393ee5c8b2d67c96d849ed679a839d9774c1 100644 (file)
@@ -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.
        */