From 4a6759b7789dc703a8ee9f1cf08af22c6e8101fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <daenzer@vmware.com>
Date: Sat, 3 Oct 2009 18:01:57 +0200
Subject: [PATCH] meta: Make sure texImage->TexFormat is valid for
 CopyTex(Sub)Image.

---
 src/mesa/drivers/common/meta.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 12e0bdde883..e1732241b3a 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -55,6 +55,7 @@
 #include "main/stencil.h"
 #include "main/texobj.h"
 #include "main/texenv.h"
+#include "main/texformat.h"
 #include "main/teximage.h"
 #include "main/texparam.h"
 #include "main/texstate.h"
@@ -2471,6 +2472,12 @@ copy_tex_image(GLcontext *ctx, GLuint dims, GLenum target, GLint level,
       return;
    }
 
+   if (texImage->TexFormat == &_mesa_null_texformat)
+	texImage->TexFormat = ctx->Driver.ChooseTextureFormat(ctx,
+							      internalFormat,
+							      format,
+							      type);
+
    _mesa_unlock_texture(ctx, texObj); /* need to unlock first */
 
    /*