summaryrefslogtreecommitdiff
path: root/src/mesa/swrast/s_blit.c
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-12-30 21:40:12 -0700
committerBrian Paul <brianp@vmware.com>2009-12-31 08:49:27 -0700
commitab26682eb4db0dbe160b13f1e320ec9164c3afc5 (patch)
treefc3c79e9b24560b256f232bd97d5b8d6e6a1cdcb /src/mesa/swrast/s_blit.c
parent699cfaeb3cde2a329b2d79ae09c7783ed4edacfe (diff)
swrast: add check for conditional rendering
Diffstat (limited to 'src/mesa/swrast/s_blit.c')
-rw-r--r--src/mesa/swrast/s_blit.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/swrast/s_blit.c b/src/mesa/swrast/s_blit.c
index 8303e4debc..f73ac78ae2 100644
--- a/src/mesa/swrast/s_blit.c
+++ b/src/mesa/swrast/s_blit.c
@@ -24,6 +24,7 @@
#include "main/glheader.h"
+#include "main/condrender.h"
#include "main/image.h"
#include "main/macros.h"
#include "s_context.h"
@@ -567,6 +568,9 @@ _swrast_BlitFramebuffer(GLcontext *ctx,
};
GLint i;
+ if (!_mesa_check_conditional_render(ctx))
+ return; /* don't clear */
+
if (!ctx->DrawBuffer->_NumColorDrawBuffers)
return;