Fix gcc version checks for _mesa_bitcount

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

diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h
index f37a93a7f4bf4e6631bcdc1f0f72900e2b641747..89008431a884a927a304bea9061eb5712d55d365 100644 (file)
--- a/src/mesa/main/dlist.h
+++ b/src/mesa/main/dlist.h
@@ -33,21 +33,12 @@
 #define DLIST_H
 
 
+#include "main/mfeatures.h"
 #include "main/mtypes.h"
 
 
 #if FEATURE_dlist
 
-#define _MESA_INIT_DLIST_FUNCTIONS(driver, impl)               \
-   do {                                                        \
-      (driver)->NewList           = impl ## NewList;           \
-      (driver)->EndList           = impl ## EndList;           \
-      (driver)->BeginCallList     = impl ## BeginCallList;     \
-      (driver)->EndCallList       = impl ## EndCallList;       \
-      (driver)->SaveFlushVertices = impl ## SaveFlushVertices; \
-      (driver)->NotifySaveBegin   = impl ## NotifyBegin;       \
-   } while (0)
-
 #define _MESA_INIT_DLIST_VTXFMT(vfmt, impl)  \
    do {                                      \
       (vfmt)->CallList  = impl ## CallList;  \
@@ -59,20 +50,20 @@ extern void GLAPIENTRY _mesa_CallList( GLuint list );
 extern void GLAPIENTRY _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
 
 
-extern void _mesa_compile_error( GLcontext *ctx, GLenum error, const char *s );
+extern void _mesa_compile_error( struct gl_context *ctx, GLenum error, const char *s );
 
-extern void *_mesa_dlist_alloc(GLcontext *ctx, GLuint opcode, GLuint sz);
+extern void *_mesa_dlist_alloc(struct gl_context *ctx, GLuint opcode, GLuint sz);
 
-extern GLint _mesa_dlist_alloc_opcode( GLcontext *ctx, GLuint sz,
-                                       void (*execute)( GLcontext *, void * ),
-                                       void (*destroy)( GLcontext *, void * ),
-                                       void (*print)( GLcontext *, void * ) );
+extern GLint _mesa_dlist_alloc_opcode( struct gl_context *ctx, GLuint sz,
+                                       void (*execute)( struct gl_context *, void * ),
+                                       void (*destroy)( struct gl_context *, void * ),
+                                       void (*print)( struct gl_context *, void * ) );
 
-extern void _mesa_delete_list(GLcontext *ctx, struct gl_display_list *dlist);
+extern void _mesa_delete_list(struct gl_context *ctx, struct gl_display_list *dlist);
 
 extern void _mesa_save_vtxfmt_init( GLvertexformat *vfmt );
 
-extern void _mesa_init_save_table( struct _glapi_table *table );
+extern struct _glapi_table *_mesa_create_save_table(void);
 
 extern void _mesa_install_dlist_vtxfmt(struct _glapi_table *disp,
                                        const GLvertexformat *vfmt);
@@ -81,32 +72,33 @@ extern void _mesa_init_dlist_dispatch(struct _glapi_table *disp);
 
 #else /* FEATURE_dlist */
 
-#define _MESA_INIT_DLIST_FUNCTIONS(driver, impl) do { } while (0)
+#include "main/compiler.h"
+
 #define _MESA_INIT_DLIST_VTXFMT(vfmt, impl) do { } while (0)
 
-static INLINE void
-_mesa_delete_list(GLcontext *ctx, struct gl_display_list *dlist)
+static inline void
+_mesa_delete_list(struct gl_context *ctx, struct gl_display_list *dlist)
 {
    /* there should be no list to delete */
    ASSERT_NO_FEATURE();
 }
 
-static INLINE void
+static inline void
 _mesa_install_dlist_vtxfmt(struct _glapi_table *disp,
                            const GLvertexformat *vfmt)
 {
 }
 
-static INLINE void
+static inline void
 _mesa_init_dlist_dispatch(struct _glapi_table *disp)
 {
 }
 
 #endif /* FEATURE_dlist */
 
-extern void _mesa_init_display_list( GLcontext * ctx );
+extern void _mesa_init_display_list( struct gl_context * ctx );
 
-extern void _mesa_free_display_list_data(GLcontext *ctx);
+extern void _mesa_free_display_list_data(struct gl_context *ctx);
 
 
 #endif /* DLIST_H */