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 098468fd176f0d7dc5538333eac265c1df57ffbb..89008431a884a927a304bea9061eb5712d55d365 100644 (file)
--- a/src/mesa/main/dlist.h
+++ b/src/mesa/main/dlist.h
@@ -5,9 +5,9 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  5.1
+ * Version:  6.5.1
  *
- * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2006  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"),
@@ -33,68 +33,72 @@
 #define DLIST_H
 
 
-#include "mtypes.h"
+#include "main/mfeatures.h"
+#include "main/mtypes.h"
 
 
-#if _HAVE_FULL_GL
+#if FEATURE_dlist
 
-extern void _mesa_destroy_list( GLcontext *ctx, GLuint list );
+#define _MESA_INIT_DLIST_VTXFMT(vfmt, impl)  \
+   do {                                      \
+      (vfmt)->CallList  = impl ## CallList;  \
+      (vfmt)->CallLists = impl ## CallLists; \
+   } while (0)
 
 extern void GLAPIENTRY _mesa_CallList( GLuint list );
 
 extern void GLAPIENTRY _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
 
-extern void GLAPIENTRY _mesa_DeleteLists( GLuint list, GLsizei range );
 
-extern void GLAPIENTRY _mesa_EndList( void );
+extern void _mesa_compile_error( struct gl_context *ctx, GLenum error, const char *s );
 
-extern GLuint GLAPIENTRY _mesa_GenLists( GLsizei range );
+extern void *_mesa_dlist_alloc(struct gl_context *ctx, GLuint opcode, GLuint sz);
 
-extern GLboolean GLAPIENTRY _mesa_IsList( GLuint list );
+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 GLAPIENTRY _mesa_ListBase( GLuint base );
+extern void _mesa_delete_list(struct gl_context *ctx, struct gl_display_list *dlist);
 
-extern void GLAPIENTRY _mesa_NewList( GLuint list, GLenum mode );
-
-extern void GLAPIENTRY _mesa_save_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
-
-extern void GLAPIENTRY _mesa_save_CallList( GLuint list );
-
-
-
-extern void _mesa_init_dlist_table( struct _glapi_table *table );
-
-extern void _mesa_save_error( GLcontext *ctx, GLenum error, const char *s );
+extern void _mesa_save_vtxfmt_init( GLvertexformat *vfmt );
 
-extern void _mesa_compile_error( GLcontext *ctx, GLenum error, const char *s );
+extern struct _glapi_table *_mesa_create_save_table(void);
 
+extern void _mesa_install_dlist_vtxfmt(struct _glapi_table *disp,
+                                       const GLvertexformat *vfmt);
 
-extern void *_mesa_alloc_instruction(GLcontext *ctx, GLuint opcode, GLuint sz);
+extern void _mesa_init_dlist_dispatch(struct _glapi_table *disp);
 
-extern GLint _mesa_alloc_opcode( GLcontext *ctx, GLuint sz,
-                                 void (*execute)( GLcontext *, void * ),
-                                 void (*destroy)( GLcontext *, void * ),
-                                 void (*print)( GLcontext *, void * ) );
+#else /* FEATURE_dlist */
 
-extern void _mesa_init_display_list( GLcontext * ctx );
+#include "main/compiler.h"
 
-extern void _mesa_save_vtxfmt_init( GLvertexformat *vfmt );
+#define _MESA_INIT_DLIST_VTXFMT(vfmt, impl) do { } while (0)
 
+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();
+}
 
-#else
+static inline void
+_mesa_install_dlist_vtxfmt(struct _glapi_table *disp,
+                           const GLvertexformat *vfmt)
+{
+}
 
-/** No-op */
-#define _mesa_destroy_list(c,l) ((void)0)
+static inline void
+_mesa_init_dlist_dispatch(struct _glapi_table *disp)
+{
+}
 
-/** No-op */
-#define _mesa_init_dlist_table(t,ts) ((void)0)
+#endif /* FEATURE_dlist */
 
-/** No-op */
-#define _mesa_init_display_list(c) ((void)0)
+extern void _mesa_init_display_list( struct gl_context * ctx );
 
-/** No-op */
-#define _mesa_save_vtxfmt_init(v) ((void)0)
+extern void _mesa_free_display_list_data(struct gl_context *ctx);
 
-#endif
 
-#endif
+#endif /* DLIST_H */