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 d943e09b29f9b90ef695fbfa2f8413ca1286b9a6..3516a41bf41a84e73d3f66505ca8ad67f4375ef7 100644 (file)
--- 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;