st/mesa: null-out stImage->Map.Data in st_texture_image_unmap()

2 files changed, 2 insertions, 4 deletions

diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 49af0a1650..9b38c21f16 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -748,7 +748,6 @@ done:
 
    if (stImage->pt && texImage->Map.Data) {
       st_texture_image_unmap(ctx->st, stImage);
-      texImage->Map.Data = NULL;
    }
 }
 
@@ -990,7 +989,6 @@ st_get_tex_image(GLcontext * ctx, GLenum target, GLint level,
    /* Unmap */
    if (stImage->pt) {
       st_texture_image_unmap(ctx->st, stImage);
-      texImage->Map.Data = NULL;
    }
 }
 
@@ -1121,7 +1119,6 @@ done:
 
    if (stImage->pt) {
       st_texture_image_unmap(ctx->st, stImage);
-      texImage->Map.Data = NULL;
    }
 }
 
@@ -1236,7 +1233,6 @@ st_CompressedTexSubImage2D(GLcontext *ctx, GLenum target, GLint level,
 
    if (stImage->pt) {
       st_texture_image_unmap(ctx->st, stImage);
-      texImage->Map.Data = NULL;
    }
 }
 
diff --git a/src/mesa/state_tracker/st_texture.c b/src/mesa/state_tracker/st_texture.c
index 3945822f66..55f6be5dcd 100644
--- a/src/mesa/state_tracker/st_texture.c
+++ b/src/mesa/state_tracker/st_texture.c
@@ -219,6 +219,8 @@ st_texture_image_unmap(struct st_context *st,
    screen->transfer_unmap(screen, stImage->transfer);
 
    screen->tex_transfer_destroy(stImage->transfer);
+
+   stImage->base.Map.Data = NULL;
 }