From: Topi Pohjolainen Date: Wed, 31 Aug 2016 08:16:12 +0000 (+0300) Subject: isl/gen8+: Allow 1D and 3D auxiliary surfaces X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=024a39511f95a156b7d6524fc0770d95fbbcd1d0;p=mesa.git 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 Reviewed-by: Jason Ekstrand --- diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c index c7639d0164e..3dfdf201d9e 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. */