Mesa (mesa_7_5_branch): mesa/st: restore flush to copy_texsubimage ( was previously finish)

[Keith Whitwell]

Module: Mesa
Branch: mesa_7_5_branch
Commit: 503632557e8904b775e1b6f3f84eb41bda3af122
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=503632557e8904b775e1b6f3f84eb41bda3af122

Author: Keith Whitwell <keithw at vmware.com>
Date:   Thu May 14 10:26:56 2009 +0100

mesa/st: restore flush to copy_texsubimage (was previously finish)

Need a flush here even though the original finish was overkill.

---

 src/mesa/state_tracker/st_cb_texture.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index aaed155..14b78d1 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -1317,6 +1317,9 @@ st_copy_texsubimage(GLcontext *ctx,
    GLboolean use_fallback = GL_TRUE;
    GLboolean matching_base_formats;
 
+   /* any rendering in progress must flushed before we grab the fb image */
+   st_flush(ctx->st, PIPE_FLUSH_RENDER_CACHE, NULL);
+
    /* make sure finalize_textures has been called? 
     */
    if (0) st_validate_state(ctx->st);