generate GL_INVALID_OPERATION in glAccum if read/draw buffers aren't the same

1 files changed, 8 insertions, 1 deletions

diff --git a/src/mesa/main/accum.c b/src/mesa/main/accum.c
index c1346bab4cd..9a32481c931 100644
--- a/src/mesa/main/accum.c
+++ b/src/mesa/main/accum.c
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
+ * Version:  6.5
  *
  * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
  *
@@ -76,6 +76,13 @@ _mesa_Accum( GLenum op, GLfloat value )
       return;
    }
 
+   if (ctx->DrawBuffer != ctx->ReadBuffer) {
+      /* See GLX_SGI_make_current_read or WGL_ARB_make_current_read */
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glAccum(different read/draw buffers)");
+      return;
+   }
+
    if (ctx->NewState)
       _mesa_update_state( ctx );