Mesa (7.10): st/mesa: CopyTex(Sub) Image should not be killed by conditional rendering

[Marek Olšák]

Module: Mesa
Branch: 7.10
Commit: 6850899f44c386cf8146f9766cb8266ab8cc2134
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6850899f44c386cf8146f9766cb8266ab8cc2134

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sun May 29 15:35:25 2011 +0200

st/mesa: CopyTex(Sub)Image should not be killed by conditional rendering

NOTE: This is a candidate for the 7.10 branch.

Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 91e56c88972448079b5aafbc2b876d0ea0e28a39)

---

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

diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 09a10ba..b3a05c0 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -1652,6 +1652,11 @@ st_copy_texsubimage(struct gl_context *ctx,
             srcY1 = srcY0 + height;
          }
 
+         /* Disable conditional rendering. */
+         if (st->render_condition) {
+            pipe->render_condition(pipe, NULL, 0);
+         }
+
          util_blit_pixels_writemask(st->blit,
                                     strb->texture,
                                     strb->surface->u.tex.level,
@@ -1663,6 +1668,13 @@ st_copy_texsubimage(struct gl_context *ctx,
                                     destX + width, destY + height,
                                     0.0, PIPE_TEX_MIPFILTER_NEAREST,
                                     format_writemask);
+
+         /* Restore conditional rendering state. */
+         if (st->render_condition) {
+            pipe->render_condition(pipe, st->render_condition,
+                                   st->condition_mode);
+         }
+
          use_fallback = GL_FALSE;
       }