[Mesa-dev] [PATCH 07/23] i965/gen9: Allow halign == 16 also for losslessly compressed

[Ben Widawsky]

On Mon, Feb 08, 2016 at 06:51:27PM +0200, Topi Pohjolainen wrote:
> Signed-off-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
> ---
>  src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> index fe525c3..6f46385 100644
> --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> @@ -530,7 +530,8 @@ intel_miptree_create_layout(struct brw_context *brw,
>     if (intel_miptree_supports_non_msrt_fast_clear(brw, mt)) {
>        if (brw->gen >= 9 || (brw->gen == 8 && num_samples <= 1))
>           layout_flags |= MIPTREE_LAYOUT_FORCE_HALIGN16;
> -   } else if (brw->gen >= 9 && num_samples > 1) {
> +   } else if (brw->gen >= 9 &&
> +              (num_samples > 1 || mt->msaa_layout == INTEL_MSAA_LAYOUT_CSS)) {

It seems like *if* we don't create a separate CSS type, we could just change
this to layout == INTEL_MSAA_LAYOUT_CMS. I'm still waiting to be convinced by a
later patch that we need the separate type.

Maybe even if we keep the CSS type, make this:
mt->msaa_layout == INTEL_MSAA_LAYOUT_CSS ||
mt->msaa_layout == INTEL_MSAA_LAYOUT_CMS

Also, I think either this patch, or the last patch should update the 
if (mt->disable_aux_buffers) case just below this.

Anyway, looks fine for now other than my opinions of questionable importance.

>        layout_flags |= MIPTREE_LAYOUT_FORCE_HALIGN16;
>     } else {
>        /* For now, nothing else has this requirement */