From 016ba4cc2c850259cf902d4d3d287040942b5c1b Mon Sep 17 00:00:00 2001 From: Oliver McFadden Date: Tue, 11 Sep 2012 09:02:42 +0300 Subject: [PATCH] mesa: remove FEATURE_accum define. Signed-off-by: Oliver McFadden Reviewed-by: Brian Paul --- src/mesa/main/accum.c | 6 ------ src/mesa/main/accum.h | 31 ------------------------------- src/mesa/main/mfeatures.h | 1 - 3 files changed, 38 deletions(-) diff --git a/src/mesa/main/accum.c b/src/mesa/main/accum.c index 16c26168..8b71640 100644 --- 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 5b3f06a..594a768 100644 --- 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 b7acbee..4e608f4 100644 --- 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 */ -- 2.7.4