On Fri, May 19, 2017 at 10:38:14AM +0100, Daniel Stone wrote:
> From: Ben Widawsky <b...@bwidawsk.net>
>
> 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.
This looks like a leftover, patch now just removes the assertion.
Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com>
>
> Recommended-by: Topi Pohjolainen <topi.pohjolai...@intel.com>
> Signed-off-by: Ben Widawsky <b...@bwidawsk.net>
> Signed-off-by: Daniel Stone <dani...@collabora.com>
> ---
> 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 e175f990bf..19c5fca4a0 100644
> --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> @@ -521,14 +521,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);
> }
>
> if (!brw_miptree_layout(brw, mt, layout_flags)) {
> --
> 2.13.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
