[Mesa-dev] [PATCH V2 08/22] i965/gen9: Use HALIGN_16 if MCS is enabled

[Ben Widawsky]

On Fri, Apr 17, 2015 at 04:51:29PM -0700, Anuj Phogat wrote:
> Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
> ---
>  src/mesa/drivers/dri/i965/brw_tex_layout.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/brw_tex_layout.c b/src/mesa/drivers/dri/i965/brw_tex_layout.c
> index d7cfe08..20dcc21 100644
> --- a/src/mesa/drivers/dri/i965/brw_tex_layout.c
> +++ b/src/mesa/drivers/dri/i965/brw_tex_layout.c
> @@ -162,7 +162,8 @@ intel_horizontal_texture_alignment_unit(struct brw_context *brw,
>     if (brw->gen >= 7 && mt->format == MESA_FORMAT_Z_UNORM16)
>        return 8;
>  
> -   if (brw->gen == 8 && mt->mcs_mt && mt->num_samples <= 1)
> +   if ((brw->gen == 8 && mt->mcs_mt && mt->num_samples <= 1) ||
> +       (brw->gen >= 9 && mt->mcs_mt))
>        return 16;
>  
>     return 4;

This is incorrect as we've discussed. I have a branch to fix it. I'd suggest
dropping it from your series.

References: http://cgit.freedesktop.org/~bwidawsk/mesa/log/?h=halign-fix