[Mesa-stable] [PATCH] mesa: fix format conversion bug in get_tex_rgba_uncompressed()

[Anuj Phogat]

On Mon, Aug 29, 2016 at 11:44 AM, Brian Paul <brianp at vmware.com> wrote:
>
> We need to set the need_convert flag with each loop iteration, not
> just when the rgba pointer is null.
>
> Bug reported by Markus Müller <mueller at imfusion.de> on mesa-users list.
> Fixes new piglit arb_texture_float-get-tex3d test.
>
> Cc: <mesa-stable at lists.freedesktop.org>
> ---
>  src/mesa/main/texgetimage.c | 14 ++++++++------
>  1 file changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
> index bd44c68..b900278 100644
> --- a/src/mesa/main/texgetimage.c
> +++ b/src/mesa/main/texgetimage.c
> @@ -495,13 +495,15 @@ get_tex_rgba_uncompressed(struct gl_context *ctx, GLuint dimensions,
>            */
>           if (format == rgba_format) {
>              rgba = dest;
> -         } else if (rgba == NULL) { /* Allocate the RGBA buffer only once */
> +         } else {
>              need_convert = true;
> -            rgba = malloc(height * rgba_stride);
> -            if (!rgba) {
> -               _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGetTexImage()");
> -               ctx->Driver.UnmapTextureImage(ctx, texImage, img);
> -               return;
> +            if (rgba == NULL) { /* Allocate the RGBA buffer only once */
> +               rgba = malloc(height * rgba_stride);
> +               if (!rgba) {
> +                  _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGetTexImage()");
> +                  ctx->Driver.UnmapTextureImage(ctx, texImage, img);
> +                  return;
> +               }
>              }
>           }
>
> --
> 1.9.1
>
> _______________________________________________
> mesa-stable mailing list
> mesa-stable at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-stable

Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>