[Mesa-dev] [PATCH] i965/blorp: Correct type of src_format in call to intel_miptree_texture_aux_usage

[Jason Ekstrand]

oof...  Have you run this through Jenkins?  It should be ok, but it will be
a functional change.  It's a good change, but it is a change.  Also, this
should probably get CCd to stable.

--Jason

On Wed, Aug 9, 2017 at 3:52 PM, Scott D Phillips <scott.d.phillips at intel.com
> wrote:

> intel_miptree_texture_aux_usage() takes an isl_format, but we are
> passing a mesa_format. clang warns:
>
>  brw_blorp.c:305:52: warning: implicit conversion from enumeration
>     type 'mesa_format' to different enumeration type
>     'enum isl_format' [-Wenum-conversion]
>        intel_miptree_texture_aux_usage(brw, src_mt, src_format);
>        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~              ^~~~~~~~~~
>
> Fixes: fc1639e46d ("i965/blorp: Use texture/render_aux_usage for blits")
> ---
>  src/mesa/drivers/dri/i965/brw_blorp.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c
> b/src/mesa/drivers/dri/i965/brw_blorp.c
> index 446f507619..d8e48064e3 100644
> --- a/src/mesa/drivers/dri/i965/brw_blorp.c
> +++ b/src/mesa/drivers/dri/i965/brw_blorp.c
> @@ -301,8 +301,9 @@ brw_blorp_blit_miptrees(struct brw_context *brw,
>        src_format = dst_format = MESA_FORMAT_R_FLOAT32;
>     }
>
> +   enum isl_format src_isl_format = brw_isl_format_for_mesa_
> format(src_format);
>     enum isl_aux_usage src_aux_usage =
> -      intel_miptree_texture_aux_usage(brw, src_mt, src_format);
> +      intel_miptree_texture_aux_usage(brw, src_mt, src_isl_format);
>     /* We do format workarounds for some depth formats so we can't reliably
>      * sample with HiZ.  One of these days, we should fix that.
>      */
> --
> 2.13.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20170809/c8129f97/attachment-0001.html>