From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Fri, 1 Jul 2016 21:25:59 +0000 (-0700)
Subject: isl: Take the slice0_extent shortcut for interleaved MSAA
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=560a92c4fd74171832ddf45910981a51c8d1418a;p=mesa.git

isl: Take the slice0_extent shortcut for interleaved MSAA

The shortcut works just fine for MSAA and the comment even says so.

Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
---

diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
index a9208f6e2b1..500eb2d2988 100644
--- a/src/intel/isl/isl.c
+++ b/src/intel/isl/isl.c
@@ -623,7 +623,7 @@ isl_calc_phys_slice0_extent_sa_gen4_2d(
 
    assert(phys_level0_sa->depth == 1);
 
-   if (info->levels == 1 && msaa_layout != ISL_MSAA_LAYOUT_INTERLEAVED) {
+   if (info->levels == 1) {
       /* Do not pad the surface to the image alignment. Instead, pad it only
        * to the pixel format's block alignment.
        *