[Mesa-dev] [PATCH 2/4] i965/miptree: Tighten up finish_mcs_write

[Ian Romanick]

This patch is

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

On 06/26/2017 11:49 AM, Jason Ekstrand wrote:
> Multisample surfaces only have a single miplevel so there's no reason to
> be passing the extra parameters around.  It only leads to confusion.
> ---
>  src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 15 ++++++++-------
>  1 file changed, 8 insertions(+), 7 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> index f5391a4..75e192a 100644
> --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> @@ -2149,18 +2149,18 @@ intel_miptree_finish_ccs_write(struct brw_context *brw,
>  static void
>  intel_miptree_finish_mcs_write(struct brw_context *brw,
>                                 struct intel_mipmap_tree *mt,
> -                               uint32_t level, uint32_t layer,
> -                               bool written_with_aux)
> +                               uint32_t layer,
> +                               bool written_with_mcs)
>  {
> -   switch (intel_miptree_get_aux_state(mt, level, layer)) {
> +   switch (intel_miptree_get_aux_state(mt, 0, layer)) {
>     case ISL_AUX_STATE_CLEAR:
> -      assert(written_with_aux);
> -      intel_miptree_set_aux_state(brw, mt, level, layer, 1,
> +      assert(written_with_mcs);
> +      intel_miptree_set_aux_state(brw, mt, 0, layer, 1,
>                                    ISL_AUX_STATE_COMPRESSED_CLEAR);
>        break;
>  
>     case ISL_AUX_STATE_COMPRESSED_CLEAR:
> -      assert(written_with_aux);
> +      assert(written_with_mcs);
>        break; /* Nothing to do */
>  
>     case ISL_AUX_STATE_COMPRESSED_NO_CLEAR:
> @@ -2365,8 +2365,9 @@ intel_miptree_finish_write(struct brw_context *brw,
>           return;
>  
>        if (mt->num_samples > 1) {
> +         assert(level == 0);
>           for (uint32_t a = 0; a < num_layers; a++) {
> -            intel_miptree_finish_mcs_write(brw, mt, level, start_layer + a,
> +            intel_miptree_finish_mcs_write(brw, mt, start_layer + a,
>                                             written_with_aux);
>           }
>        } else {
>