summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-09-17 10:22:38 -0600
committerBrian Paul <brian.paul@tungstengraphics.com>2008-09-17 10:23:00 -0600
commit66682651b622be201b211d50c7311e0b81b2b4a5 (patch)
tree60cf42c5a8452f35aa95eab289d0df3f1fac42c2
parent63b915d743e1807696a55f5e52a1fe9df799aeb3 (diff)
gallium: need to finish, not flush, in st_copy_texsubimage()
-rw-r--r--src/mesa/state_tracker/st_cb_texture.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 2ba3766939..2e1ad93942 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -1053,7 +1053,8 @@ st_copy_texsubimage(GLcontext *ctx,
GLboolean use_fallback = GL_TRUE;
GLboolean matching_base_formats;
- st_flush(ctx->st, PIPE_FLUSH_RENDER_CACHE, NULL);
+ /* any rendering in progress must complete before we grab the fb image */
+ st_finish(ctx->st);
/* determine if copying depth or color data */
if (texBaseFormat == GL_DEPTH_COMPONENT) {