Mesa (master): swrast: BlitFramebuffer should not be killed by conditional rendering

[Marek Olšák]

Module: Mesa
Branch: master
Commit: c0277d953975ddc232aa34a101955d8314c99b96
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c0277d953975ddc232aa34a101955d8314c99b96

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

swrast: BlitFramebuffer 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>

---

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

diff --git a/src/mesa/swrast/s_blit.c b/src/mesa/swrast/s_blit.c
index d943e09..3516a41 100644
--- a/src/mesa/swrast/s_blit.c
+++ b/src/mesa/swrast/s_blit.c
@@ -568,9 +568,6 @@ _swrast_BlitFramebuffer(struct gl_context *ctx,
    };
    GLint i;
 
-   if (!_mesa_check_conditional_render(ctx))
-      return; /* don't clear */
-
    if (!ctx->DrawBuffer->_NumColorDrawBuffers)
       return;