summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-11-17 20:23:55 -0700
committerBrian Paul <brianp@vmware.com>2009-11-17 22:28:49 -0700
commitea5308e03a540a4065927cee8c1b44dbd16d22ad (patch)
tree02b0f1552ad2346aa482ae1ca5e64bd4abf5b65b
parente4b2a092660d626c9ba61d1e65b5d80bfe1d8c48 (diff)
st/mesa: minor changes in st_texture_image_map()
-rw-r--r--src/mesa/state_tracker/st_texture.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/state_tracker/st_texture.c b/src/mesa/state_tracker/st_texture.c
index 55f6be5dcd..52fb7a3705 100644
--- a/src/mesa/state_tracker/st_texture.c
+++ b/src/mesa/state_tracker/st_texture.c
@@ -194,6 +194,7 @@ st_texture_image_map(struct st_context *st, struct st_texture_image *stImage,
struct pipe_context *pipe = st->pipe;
struct pipe_screen *screen = pipe->screen;
struct pipe_texture *pt = stImage->pt;
+ GLubyte *map = NULL;
DBG("%s \n", __FUNCTION__);
@@ -202,9 +203,9 @@ st_texture_image_map(struct st_context *st, struct st_texture_image *stImage,
usage, x, y, w, h);
if (stImage->transfer)
- return screen->transfer_map(screen, stImage->transfer);
- else
- return NULL;
+ map = screen->transfer_map(screen, stImage->transfer);
+
+ return map;
}