summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2011-05-29 17:52:29 +0200
committerMarek Olšák <maraeo@gmail.com>2011-05-30 10:50:53 +0200
commitc0277d953975ddc232aa34a101955d8314c99b96 (patch)
treea5ebe65d1a3f1fe4180f978ce0b2e1ccbdb20d19 /src/mesa
parent1c95c3ef9c51c0eb218f80959bbbf29d213a6af0 (diff)
downloadexternal_mesa3d-c0277d953975ddc232aa34a101955d8314c99b96.zip
external_mesa3d-c0277d953975ddc232aa34a101955d8314c99b96.tar.gz
external_mesa3d-c0277d953975ddc232aa34a101955d8314c99b96.tar.bz2
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>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/swrast/s_blit.c3
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;