summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichel Dänzer <daenzer@vmware.com>2010-01-04 16:54:29 +0100
committerMichel Dänzer <daenzer@vmware.com>2010-01-04 16:54:29 +0100
commit1e414df894fc70b7024eb38c812e582336014974 (patch)
tree1734ec0ab49ccec9c1c5c78dc2ee68dffb860a10 /src
parentacd1451393068762a46a06aee3af9e94bc09e147 (diff)
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().
Diffstat (limited to 'src')
-rw-r--r--src/mesa/state_tracker/st_cb_texture.c2
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 d4630a514f..cb9106c7de 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;
}