[Mesa-dev] [PATCH 10/17] main/teximage: Even on failure use valid format for init()

[Jason Ekstrand]

Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

Cc stable?

On Fri, Jul 21, 2017 at 8:01 AM, Topi Pohjolainen <
topi.pohjolainen at gmail.com> wrote:

> Otherwise init_teximage_fields_ms() (called by
> _mesa_init_teximage_fields()) will always assert as it can't
> find valid base format.
>
> Signed-off-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
> ---
>  src/mesa/main/teximage.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
> index 5e13025ed1..2132aaee76 100644
> --- a/src/mesa/main/teximage.c
> +++ b/src/mesa/main/teximage.c
> @@ -5772,7 +5772,7 @@ texture_image_multisample(struct gl_context *ctx,
> GLuint dims,
>               * like, but being tidy is good.
>               */
>              _mesa_init_teximage_fields(ctx, texImage,
> -                  0, 0, 0, 0, GL_NONE, MESA_FORMAT_NONE);
> +                  0, 0, 0, 0, internalformat, texFormat);
>           }
>        }
>
> --
> 2.11.0
>
> _______________________________________________
> 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/20170721/486a334c/attachment.html>