Mesa (main): Revert "intel/isl: Don't reconfigure aux surfaces for MCS"

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Jan 21 20:54:43 UTC 2022


Module: Mesa
Branch: main
Commit: 58a843ab14e0eecf044a35154da72cdf7ab6f15a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=58a843ab14e0eecf044a35154da72cdf7ab6f15a

Author: Nanley Chery <nanley.g.chery at intel.com>
Date:   Tue Dec  7 20:40:15 2021 -0500

Revert "intel/isl: Don't reconfigure aux surfaces for MCS"

This reverts commit 2f0fbe06e65c5ae6c3e9ab3943a4a7d01ae9dc2f.

We don't handle the reconfiguration of existing HiZ surfaces, nor do we
do so for CCS surfaces. This code path is unused, so we remove it.

Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
Acked-by: Kenneth Graunke <kenneth at whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14464>

---

 src/intel/isl/isl.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
index 79d64a9f7de..f100cc523d2 100644
--- a/src/intel/isl/isl.c
+++ b/src/intel/isl/isl.c
@@ -2057,9 +2057,6 @@ isl_surf_get_mcs_surf(const struct isl_device *dev,
    if (surf->msaa_layout != ISL_MSAA_LAYOUT_ARRAY)
       return false;
 
-   if (mcs_surf->size_B > 0)
-      return false;
-
    /* The following are true of all multisampled surfaces */
    assert(surf->samples > 1);
    assert(surf->dim == ISL_SURF_DIM_2D);



More information about the mesa-commit mailing list