[Mesa-dev] [v2 04/19] i965: Stop considering if msrt aux buffers need aux buffer

[Ben Widawsky]

On Thu, Feb 11, 2016 at 08:33:57PM +0200, Topi Pohjolainen wrote:
> Auxiliary buffers are always created with sample number of zero
> which effectively prevents intel_miptree_create_layout() from trying
> to associate auxiliary buffers with auxiliary buffers.
> 
> Now that there is more direct path available lets start using it
> instead and stop even checking for such (im)possibility.
> 
> v2 (Ben): Do not signal msaa layout with explicit argument but
>           using layout_flags instead.
> 
> Signed-off-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
> Reviewed-by: Ben Widawsky <benjamin.widawsky at intel.com>
> ---
>  src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> index e1cf15b..5f739d9 100644
> --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> @@ -1468,16 +1468,16 @@ intel_miptree_alloc_mcs(struct brw_context *brw,
>      */
>     const uint32_t mcs_flags = MIPTREE_LAYOUT_ACCELERATED_UPLOAD |
>                                MIPTREE_LAYOUT_TILING_Y;
> -   mt->mcs_mt = intel_miptree_create(brw,
> -                                     mt->target,
> -                                     format,
> -                                     mt->first_level,
> -                                     mt->last_level,
> -                                     mt->logical_width0,
> -                                     mt->logical_height0,
> -                                     mt->logical_depth0,
> -                                     0 /* num_samples */,
> -                                     mcs_flags);
> +   mt->mcs_mt = miptree_create(brw,
> +                               mt->target,
> +                               format,
> +                               mt->first_level,
> +                               mt->last_level,
> +                               mt->logical_width0,
> +                               mt->logical_height0,
> +                               mt->logical_depth0,
> +                               0 /* num_samples */,
> +                               mcs_flags);
>  
>     /* From the Ivy Bridge PRM, Vol 2 Part 1 p326:
>      *

This patch is a great step in getting rid of some unnecessary [strictly IMHO]
recursion. Unfortunately, now an mcs miptree can't have it's own mcs miptree :P

I think there is an issue with the last patch, but I'm fine with moving ahead on
1, 2, and this, now.
Reviewed-by: Ben Widawsky <benjamin.widawsky at intel.com>