From: Marek Olšák <maraeo@gmail.com>
Date: Sun, 29 May 2011 15:52:29 +0000 (+0200)
Subject: swrast: BlitFramebuffer should not be killed by conditional rendering
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c0277d953975ddc232aa34a101955d8314c99b96;p=mesa.git

swrast: BlitFramebuffer should not be killed by conditional rendering

NOTE: This is a candidate for the 7.10 branch.

Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/mesa/swrast/s_blit.c b/src/mesa/swrast/s_blit.c
index d943e09b29f..3516a41bf41 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;