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 8682525dc146a1c53a47c13d74febf84e16b34b5..93442444979eac1d8db034cb6488caa47ea098d9 100644 (file)
--- a/src/mesa/main/accum.h
+++ b/src/mesa/main/accum.h
@@ -1,3 +1,12 @@
+/**
+ * \file accum.h
+ * Accumulation buffer operations.
+ * 
+ * \if subset
+ * (No-op)
+ *
+ * \endif
+ */
 
 /*
  * Mesa 3-D graphics library
@@ -24,19 +33,43 @@
  */
 
 
+
 #ifndef ACCUM_H
 #define ACCUM_H
 
+#include "main/glheader.h"
+#include "main/mfeatures.h"
 
-#include "mtypes.h"
+struct _glapi_table;
+struct gl_context;
 
+#if FEATURE_accum
+
+extern void GLAPIENTRY
+_mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
 
 extern void
-_mesa_Accum( GLenum op, GLfloat value );
+_mesa_init_accum_dispatch(struct _glapi_table *disp);
 
+#else /* FEATURE_accum */
 
-extern void
-_mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
+#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)
+{
+}
 
+#endif /* FEATURE_accum */
+
+extern void
+_mesa_init_accum( struct gl_context *ctx );
 
-#endif
+#endif /* ACCUM_H */