mesa: simplify some extension testing code

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

diff --git a/src/mesa/main/attrib.h b/src/mesa/main/attrib.h
index d478aeb06542e11a70d66f3c2189a2c70eac4e89..6b48a17663030866d5321cd4a5f90c8384576fc2 100644 (file)
--- a/src/mesa/main/attrib.h
+++ b/src/mesa/main/attrib.h
@@ -1,10 +1,8 @@
-/* $Id: attrib.h,v 1.4 2000/11/22 07:32:16 joukj Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.3
+ * Version:  7.1
  *
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2007  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"),
@@ -24,25 +22,55 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
 #ifndef ATTRIB_H
-#define ATTRIB_h
+#define ATTRIB_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 
-extern void
+#if FEATURE_attrib_stack
+
+extern void GLAPIENTRY
 _mesa_PushAttrib( GLbitfield mask );
 
-extern void
+extern void GLAPIENTRY
 _mesa_PopAttrib( void );
 
-extern void
+extern void GLAPIENTRY
 _mesa_PushClientAttrib( GLbitfield mask );
 
-extern void
+extern void GLAPIENTRY
 _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 );
+
+extern void 
+_mesa_free_attrib_data( GLcontext *ctx );
 
-#endif
+#endif /* ATTRIB_H */