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 0f2263bd49c1bdfb84cced07a39bfba69c87d5cb..93442444979eac1d8db034cb6488caa47ea098d9 100644 (file)
--- a/src/mesa/main/accum.h
+++ b/src/mesa/main/accum.h
@@ -1,21 +1,29 @@
-/* $Id: accum.h,v 1.2 1999/11/11 01:22:25 brianp Exp $ */
+/**
+ * \file accum.h
+ * Accumulation buffer operations.
+ * 
+ * \if subset
+ * (No-op)
+ *
+ * \endif
+ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
- * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
- * 
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -26,27 +34,42 @@
 
 
 
-
-
 #ifndef ACCUM_H
 #define ACCUM_H
 
+#include "main/glheader.h"
+#include "main/mfeatures.h"
 
-#include "types.h"
+struct _glapi_table;
+struct gl_context;
 
+#if FEATURE_accum
 
-extern void gl_alloc_accum_buffer( GLcontext *ctx );
+extern void GLAPIENTRY
+_mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
 
+extern void
+_mesa_init_accum_dispatch(struct _glapi_table *disp);
 
-extern void gl_clear_accum_buffer( GLcontext *ctx );
+#else /* FEATURE_accum */
 
+#include "main/compiler.h"
 
-extern void
-_mesa_Accum( GLenum op, GLfloat value );
+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)
+{
+}
 
-extern void
-_mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
+#endif /* FEATURE_accum */
 
+extern void
+_mesa_init_accum( struct gl_context *ctx );
 
-#endif
+#endif /* ACCUM_H */