[Mesa-dev] [PATCH v2] i965/miptree: Use enum instead of boolean.

[Eric Engestrom]

On Wednesday, 2018-10-10 16:13:37 -0700, Rafael Antognolli wrote:
> ISL_AUX_USAGE_NONE happens to be the same as "false", but let's do the
> right thing and use the enum.
> 
> v2: fix intel_miptree_finish_depth too (Caio)
> 
> Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
> Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

Fixes: 554f7d6d02931ea45653c "i965: Move depth to the new resolve functions"
Fixes: 421d713eec705cb0af551 "i965: Use the new resolve function for several simple cases"

> ---
> 
> I just added the finish_depth() fix in the same patch and kept the rb's,
> since it's a one-liner. And imho it makes sense to have all the fixes in
> a single commit. Hopefully it's not an issue.
> 
>  src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 2 +-
>  src/mesa/drivers/dri/i965/intel_mipmap_tree.h | 5 +++--
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> index e32641f4098..69b7a96b9c7 100644
> --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> @@ -2727,7 +2727,7 @@ intel_miptree_finish_depth(struct brw_context *brw,
>  {
>     if (depth_written) {
>        intel_miptree_finish_write(brw, mt, level, start_layer, layer_count,
> -                                 mt->aux_buf != NULL);
> +                                 mt->aux_usage);
>     }
>  }
>  
> diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
> index 708757c47b8..b0333655ad5 100644
> --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
> +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
> @@ -613,9 +613,10 @@ intel_miptree_access_raw(struct brw_context *brw,
>                           uint32_t level, uint32_t layer,
>                           bool write)
>  {
> -   intel_miptree_prepare_access(brw, mt, level, 1, layer, 1, false, false);
> +   intel_miptree_prepare_access(brw, mt, level, 1, layer, 1,
> +                                ISL_AUX_USAGE_NONE, false);
>     if (write)
> -      intel_miptree_finish_write(brw, mt, level, layer, 1, false);
> +      intel_miptree_finish_write(brw, mt, level, layer, 1, ISL_AUX_USAGE_NONE);
>  }
>  
>  enum isl_aux_usage
> -- 
> 2.17.1
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev