From b9b88516f8d3efc902696f1092519e298ceb7cdb Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 29 Aug 2016 11:18:18 -0600 Subject: mesa: fix format conversion bug in get_tex_rgba_uncompressed() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 on mesa-users list. Fixes new piglit arb_texture_float-get-tex3d test. Cc: Reviewed-by: Anuj Phogat --- src/mesa/main/texgetimage.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/mesa/main') diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c index bd44c687769..b9002787344 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; + } } } -- cgit v1.2.3