mesa: Validate the layer selection of an array texture too

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

diff --git a/src/mesa/main/accum.h b/src/mesa/main/accum.h
index 5b3f06aa9f12208a6afcd34fc5db0df2ba995745..a5665c757d1ac901c42d96a4e112c2c8315b0859 100644 (file)
--- a/src/mesa/main/accum.h
+++ b/src/mesa/main/accum.h
@@ -10,7 +10,6 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
  *
  * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
  *
@@ -27,9 +26,10 @@
  * 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
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 
@@ -38,19 +38,15 @@
 #define ACCUM_H
 
 #include "main/glheader.h"
-#include "main/mfeatures.h"
 
 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 );
-
-extern void
-_mesa_init_accum_dispatch(struct _glapi_table *disp);
+void GLAPIENTRY
+_mesa_Accum( GLenum op, GLfloat value );
 
 extern void
 _mesa_accum(struct gl_context *ctx, GLenum op, GLfloat value);
@@ -58,35 +54,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 );