Mesa (mesa_7_7_branch): st/mesa: Only call st_texture_image_unmap() if texImage->Data is non-NULL.

[Michel Dänzer]

Module: Mesa
Branch: mesa_7_7_branch
Commit: 1e414df894fc70b7024eb38c812e582336014974
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1e414df894fc70b7024eb38c812e582336014974

Author: Michel Dänzer <daenzer at vmware.com>
Date:   Mon Jan  4 16:54:29 2010 +0100

st/mesa: Only call st_texture_image_unmap() if texImage->Data is non-NULL.

This was already done in st_TexImage() but was missed between incremental
changes to st_TexSubimage().

---

 src/mesa/state_tracker/st_cb_texture.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index d4630a5..cb9106c 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -1090,7 +1090,7 @@ st_TexSubimage(GLcontext *ctx, GLint dims, GLenum target, GLint level,
 done:
    _mesa_unmap_teximage_pbo(ctx, packing);
 
-   if (stImage->pt) {
+   if (stImage->pt && texImage->Data) {
       st_texture_image_unmap(ctx->st, stImage);
       texImage->Data = NULL;
    }