r600g: pad the DMA CS to a multiple of 8 dwords

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

diff --git a/src/mesa/main/attrib.h b/src/mesa/main/attrib.h
index 2cf8fe693453a12414cb468f85be3714c966d3ab..1ecf3a591f2884ddd5f7c0cd98b891441727c068 100644 (file)
--- a/src/mesa/main/attrib.h
+++ b/src/mesa/main/attrib.h
@@ -26,10 +26,12 @@
 #define ATTRIB_H
 
 
-#include "mtypes.h"
+#include "compiler.h"
+#include "glheader.h"
+#include "mfeatures.h"
 
-
-#if _HAVE_FULL_GL
+struct _glapi_table;
+struct gl_context;
 
 extern void GLAPIENTRY
 _mesa_PushAttrib( GLbitfield mask );
@@ -44,17 +46,9 @@ extern void GLAPIENTRY
 _mesa_PopClientAttrib( void );
 
 extern void 
-_mesa_init_attrib( GLcontext *ctx );
+_mesa_init_attrib( struct gl_context *ctx );
 
 extern void 
-_mesa_free_attrib_data( GLcontext *ctx );
-
-#else
-
-/** No-op */
-#define _mesa_init_attrib( c ) ((void)0)
-#define _mesa_free_attrib_data( c ) ((void)0)
-
-#endif
+_mesa_free_attrib_data( struct gl_context *ctx );
 
-#endif
+#endif /* ATTRIB_H */