summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2003-11-13 22:16:45 +0000
committerBrian Paul <[email protected]>2003-11-13 22:16:45 +0000
commit3a0e0b284fd74aa6cb7b380a59cf20e62f8f8ffd (patch)
tree099dfc5bc0b5bfb59a5bc49e448d5ccc0c47cbe0 /src
parentaf6162e3406ec4e0c58e4c58d225e371c05d5008 (diff)
no-op glAccum in selection/feedback mode (per Mark Kilgard's updates to the 1.5 spec)
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/accum.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/mesa/main/accum.c b/src/mesa/main/accum.c
index 74ea4dc6292..315bd33b61d 100644
--- a/src/mesa/main/accum.c
+++ b/src/mesa/main/accum.c
@@ -1,9 +1,8 @@
-
/*
* Mesa 3-D graphics library
- * Version: 4.1
+ * Version: 5.1
*
- * Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -51,8 +50,7 @@ _mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
COPY_4FV( ctx->Accum.ClearColor, tmp );
}
-/* Should really be a driver-supplied function?
- */
+
void GLAPIENTRY
_mesa_Accum( GLenum op, GLfloat value )
{
@@ -68,6 +66,11 @@ _mesa_Accum( GLenum op, GLfloat value )
if (ctx->NewState)
_mesa_update_state( ctx );
+ if (ctx->RenderMode != GL_RENDER) {
+ /* no-op */
+ return;
+ }
+
/* Determine region to operate upon. */
if (ctx->Scissor.Enabled) {
xpos = ctx->Scissor.X;