Mesa (master): isl/gen8+: Allow 1D and 3D auxiliary surfaces

[Topi Pohjolainen]

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

Author: Topi Pohjolainen <topi.pohjolainen at intel.com>
Date:   Wed Aug 31 11:16:12 2016 +0300

isl/gen8+: Allow 1D and 3D auxiliary surfaces

Otherwise once mcs buffer gets allocated without delay for lossless
compression (same as we do for msaa), assert starts to fire in
piglit case: tex3d. The test uses depth of one which is in fact
supported even now.

v2 (Jason): Allow also 1D case as there is nothing in the specs
            constraining it either.

Signed-off-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

---

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

diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
index c7639d0..3dfdf20 100644
--- a/src/intel/isl/isl.c
+++ b/src/intel/isl/isl.c
@@ -1329,7 +1329,8 @@ isl_surf_get_ccs_surf(const struct isl_device *dev,
    assert(surf->samples == 1 && surf->msaa_layout == ISL_MSAA_LAYOUT_NONE);
    assert(ISL_DEV_GEN(dev) >= 7);
 
-   assert(surf->dim == ISL_SURF_DIM_2D);
+   assert(ISL_DEV_GEN(dev) >= 8 || surf->dim == ISL_SURF_DIM_2D);
+
    assert(surf->logical_level0_px.depth == 1);
 
    /* TODO: More conditions where it can fail. */