mesa: remove FEATURE_accum define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/mesa/main/accum.c b/src/mesa/main/accum.c
index 16c26168ad116e9e7f00adef04f5381c63009255..8b71640df6c483000714657d575a89e6f62668c0 100644 (file)
--- a/src/mesa/main/accum.c
+++ b/src/mesa/main/accum.c
@@ -36,9 +36,6 @@
 #include "main/dispatch.h"
 
 
-#if FEATURE_accum
-
-
 void GLAPIENTRY
 _mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
 {
@@ -496,9 +493,6 @@ _mesa_accum(struct gl_context *ctx, GLenum op, GLfloat value)
 }
 
 
-#endif /* FEATURE_accum */
-
-
 void 
 _mesa_init_accum( struct gl_context *ctx )
 {

diff --git a/src/mesa/main/accum.h b/src/mesa/main/accum.h
index 5b3f06aa9f12208a6afcd34fc5db0df2ba995745..594a7687db03699e7c7ca688c5530f4c06621764 100644 (file)
--- a/src/mesa/main/accum.h
+++ b/src/mesa/main/accum.h
@@ -44,8 +44,6 @@ struct _glapi_table;
 struct gl_context;
 struct gl_renderbuffer;
 
-#if FEATURE_accum
-
 extern void GLAPIENTRY
 _mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
 
@@ -58,35 +56,6 @@ _mesa_accum(struct gl_context *ctx, GLenum op, GLfloat value);
 extern void
 _mesa_clear_accum_buffer(struct gl_context *ctx);
 
-#else /* FEATURE_accum */
-
-#include "main/compiler.h"
-
-static inline void
-_mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
-{
-   /* this is used in _mesa_PopAttrib */
-   ASSERT_NO_FEATURE();
-}
-
-static inline void
-_mesa_init_accum_dispatch(struct _glapi_table *disp)
-{
-}
-
-static inline void
-_mesa_accum(struct gl_context *ctx, GLenum op, GLfloat value)
-{
-}
-
-static inline void
-_mesa_clear_accum_buffer(struct gl_context *ctx)
-{
-}
-
-
-#endif /* FEATURE_accum */
-
 extern void
 _mesa_init_accum( struct gl_context *ctx );
 

diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index b7acbee7e0f019f17aac8f5d08a6b7c996202496..4e608f489e23c8f034fffc2be22491fa03014a1c 100644 (file)
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -84,7 +84,6 @@
 #define FEATURE_remap_table               0
 #endif
 
-#define FEATURE_accum                     FEATURE_GL
 #define FEATURE_arrayelt                  FEATURE_GL
 #define FEATURE_attrib_stack              FEATURE_GL
 /* this disables vtxfmt, api_loopback, and api_noop completely */