[Mesa-dev] [PATCH 32/34] i965/miptree: Remove dead code assertion

[Pohjolainen, Topi]

On Mon, Jan 23, 2017 at 10:21:55PM -0800, Ben Widawsky wrote:
> We no longer allocate a miptree for the mcs_buf, so this is not a useful
> assertion.
> 
> While here, move the CCS disabling so that we only conditionally shut it
> off. This helps us dtrt later when CCS is used in more places.
> 
> Recommended-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

Thanks!

Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

> Signed-off-by: Ben Widawsky <ben at bwidawsk.net>
> ---
>  src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 8 --------
>  1 file changed, 8 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> index 7edce7d92e..a2d555b8d3 100644
> --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> @@ -522,14 +522,6 @@ intel_miptree_create_layout(struct brw_context *brw,
>        layout_flags |= MIPTREE_LAYOUT_FORCE_HALIGN16;
>     } else {
>        mt->aux_disable |= INTEL_AUX_DISABLE_CCS;
> -
> -      const UNUSED bool is_lossless_compressed_aux =
> -         brw->gen >= 9 && num_samples == 1 &&
> -         mt->format == MESA_FORMAT_R_UINT32;
> -
> -      /* For now, nothing else has this requirement */
> -      assert(is_lossless_compressed_aux ||
> -             (layout_flags & MIPTREE_LAYOUT_FORCE_HALIGN16) == 0);
>     }
>  
>     brw_miptree_layout(brw, mt, layout_flags);
> -- 
> 2.11.0
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev