summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2011-04-21 16:52:21 -0700
committerEric Anholt <eric@anholt.net>2011-04-23 13:21:56 -0700
commit332822bd3d8c43cc81686148c0857b8df697341e (patch)
tree223f6ece4742aba97043cc148cc652dbec088c2b
parentfb60040b691c174c1bfffb46cb6c39bbae6f27c5 (diff)
swrast: Disable glAccum drawing during conditional rendering.
-rw-r--r--src/mesa/swrast/s_accum.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/swrast/s_accum.c b/src/mesa/swrast/s_accum.c
index 88d107a17da..0ec907d7979 100644
--- a/src/mesa/swrast/s_accum.c
+++ b/src/mesa/swrast/s_accum.c
@@ -24,6 +24,7 @@
#include "main/glheader.h"
+#include "main/condrender.h"
#include "main/context.h"
#include "main/macros.h"
#include "main/imports.h"
@@ -553,6 +554,9 @@ _swrast_Accum(struct gl_context *ctx, GLenum op, GLfloat value)
return;
}
+ if (!_mesa_check_conditional_render(ctx))
+ return;
+
swrast_render_start(ctx);
/* Compute region after calling swrast_render_start() so that we know the