Mesa (master): intel/isl: Don't reconfigure aux surfaces for MCS

[GitLab Mirror]

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

Author: Sagar Ghuge <sagar.ghuge at intel.com>
Date:   Thu Sep 19 08:20:34 2019 -0700

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

If aux for MCS is already configured, don't configure again.

v2: Fix missing period in commit message (Nanley Chery)

Signed-off-by: Sagar Ghuge <sagar.ghuge at intel.com>
Reviewed-by: Nanley Chery <nanley.g.chery at intel.com>

---

 src/intel/isl/isl.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
index c756fb0c80f..b22cd009e83 100644
--- a/src/intel/isl/isl.c
+++ b/src/intel/isl/isl.c
@@ -1773,6 +1773,9 @@ 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);