mesa: Fix core GL genned-name handling for glBeginQuery().

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

diff --git a/src/mesa/main/attrib.h b/src/mesa/main/attrib.h
index 6b48a17663030866d5321cd4a5f90c8384576fc2..f75c3c5ced5d03995eddc0de5772b7e2463263d7 100644 (file)
--- a/src/mesa/main/attrib.h
+++ b/src/mesa/main/attrib.h
@@ -26,10 +26,12 @@
 #define ATTRIB_H
 
 
-#include "main/mtypes.h"
+#include "compiler.h"
+#include "glheader.h"
+#include "mfeatures.h"
 
-
-#if FEATURE_attrib_stack
+struct _glapi_table;
+struct gl_context;
 
 extern void GLAPIENTRY
 _mesa_PushAttrib( GLbitfield mask );
@@ -46,31 +48,10 @@ _mesa_PopClientAttrib( void );
 extern void
 _mesa_init_attrib_dispatch(struct _glapi_table *disp);
 
-#else /* FEATURE_attrib_stack */
-
-static INLINE void
-_mesa_PushClientAttrib( GLbitfield mask )
-{
-   ASSERT_NO_FEATURE();
-}
-
-static INLINE void
-_mesa_PopClientAttrib( void )
-{
-   ASSERT_NO_FEATURE();
-}
-
-static INLINE void
-_mesa_init_attrib_dispatch(struct _glapi_table *disp)
-{
-}
-
-#endif /* FEATURE_attrib_stack */
-
 extern void 
-_mesa_init_attrib( GLcontext *ctx );
+_mesa_init_attrib( struct gl_context *ctx );
 
 extern void 
-_mesa_free_attrib_data( GLcontext *ctx );
+_mesa_free_attrib_data( struct gl_context *ctx );
 
 #endif /* ATTRIB_H */