Mesa (master): swrast: Disable glAccum drawing during conditional rendering .

[Eric Anholt]

Module: Mesa
Branch: master
Commit: 332822bd3d8c43cc81686148c0857b8df697341e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=332822bd3d8c43cc81686148c0857b8df697341e

Author: Eric Anholt <eric at anholt.net>
Date:   Thu Apr 21 16:52:21 2011 -0700

swrast: Disable glAccum drawing during conditional rendering.

---

 src/mesa/swrast/s_accum.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/mesa/swrast/s_accum.c b/src/mesa/swrast/s_accum.c
index 88d107a..0ec907d 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