mesa: Clean up header file inclusion in accum.h.

[mesa.git] / src / mesa / main / accum.h

diff --git a/src/mesa/main/accum.h b/src/mesa/main/accum.h
index ce92688a5b980ac74edbe6c02ddabc2dc9c0f67e..93442444979eac1d8db034cb6488caa47ea098d9 100644 (file)
--- a/src/mesa/main/accum.h
+++ b/src/mesa/main/accum.h
@@ -37,26 +37,39 @@
 #ifndef ACCUM_H
 #define ACCUM_H
 
+#include "main/glheader.h"
+#include "main/mfeatures.h"
 
-#include "mtypes.h"
+struct _glapi_table;
+struct gl_context;
 
-#if _HAVE_FULL_GL
+#if FEATURE_accum
 
 extern void GLAPIENTRY
-_mesa_Accum( GLenum op, GLfloat value );
+_mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
 
+extern void
+_mesa_init_accum_dispatch(struct _glapi_table *disp);
 
-extern void GLAPIENTRY
-_mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
+#else /* FEATURE_accum */
+
+#include "main/compiler.h"
 
-extern void 
-_mesa_init_accum( GLcontext *ctx );
+static INLINE void
+_mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
+{
+   /* this is used in _mesa_PopAttrib */
+   ASSERT_NO_FEATURE();
+}
 
-#else
+static INLINE void
+_mesa_init_accum_dispatch(struct _glapi_table *disp)
+{
+}
 
-/** No-op */
-#define _mesa_init_accum( c ) ((void)0)
+#endif /* FEATURE_accum */
 
-#endif
+extern void
+_mesa_init_accum( struct gl_context *ctx );
 
-#endif
+#endif /* ACCUM_H */