meta/copy_image: use precomputed dst_internal_format to avoid segfault
authorIlia Mirkin <imirkin@alum.mit.edu>
Wed, 17 Feb 2016 17:28:04 +0000 (12:28 -0500)
committerIlia Mirkin <imirkin@alum.mit.edu>
Fri, 19 Feb 2016 18:10:28 +0000 (13:10 -0500)
If the destination is a renderbuffer, dst_tex_image will be NULL. This
fixes the *to_renderbuffer dEQP copy image tests.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
Cc: mesa-stable@lists.freedesktop.org
src/mesa/drivers/common/meta_copy_image.c

index 6534d432e614e40ea920edf1fdf0f7163177622b..57c3f686b0c35f3b3a08d557b7c3cacdc7757a2b 100644 (file)
@@ -203,7 +203,7 @@ _mesa_meta_CopyImageSubData_uncompressed(struct gl_context *ctx,
          src_tex_image = wrap_renderbuffer(ctx, src_renderbuffer);
       }
       if (!make_view(ctx, src_tex_image, &src_view_tex_image, &src_view_texture,
-                     dst_tex_image->InternalFormat))
+                     dst_internal_format))
          goto cleanup;
    }