summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-11-17 20:26:32 -0700
committerBrian Paul <brianp@vmware.com>2009-11-17 22:28:49 -0700
commit903b54ae03dd400789cb4c24a09486a489ec3db1 (patch)
treef998129083ff2d12ebabda786f6316d83e1ce56e
parentea5308e03a540a4065927cee8c1b44dbd16d22ad (diff)
st/mesa: remove redundant assertion
-rw-r--r--src/mesa/state_tracker/st_cb_texture.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 9b38c21f16..d1155e19b1 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -1706,15 +1706,11 @@ copy_image_data_to_texture(GLcontext *ctx,
pipe_texture_reference(&stImage->pt, NULL);
}
else if (stImage->base.Map.Data) {
- assert(stImage->base.Map.Data != NULL);
-
/* More straightforward upload.
*/
-
st_teximage_flush_before_map(st, stObj->pt, stImage->face, dstLevel,
PIPE_TRANSFER_WRITE);
-
st_texture_image_data(st,
stObj->pt,
stImage->face,