Merge commit 'origin/gallium-0.1' into gallium-0.2

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

diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h
index 945cebbaab9cc2c6497006539affb5a39080471a..ef6a10af8322b18faff6c6154fa92238f52e7d99 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"),
@@ -38,55 +38,49 @@
 
 #if _HAVE_FULL_GL
 
-extern void _mesa_init_lists( void );
+extern void
+_mesa_delete_list(GLcontext *ctx, struct mesa_display_list *dlist);
 
-extern void _mesa_destroy_list( GLcontext *ctx, GLuint list );
+extern void GLAPIENTRY _mesa_CallList( GLuint list );
 
-extern void _mesa_CallList( GLuint list );
+extern void GLAPIENTRY _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
 
-extern void _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
+extern void GLAPIENTRY _mesa_DeleteLists( GLuint list, GLsizei range );
 
-extern void _mesa_DeleteLists( GLuint list, GLsizei range );
+extern void GLAPIENTRY _mesa_EndList( void );
 
-extern void _mesa_EndList( void );
+extern GLuint GLAPIENTRY _mesa_GenLists( GLsizei range );
 
-extern GLuint _mesa_GenLists( GLsizei range );
+extern GLboolean GLAPIENTRY _mesa_IsList( GLuint list );
 
-extern GLboolean _mesa_IsList( GLuint list );
+extern void GLAPIENTRY _mesa_ListBase( GLuint base );
 
-extern void _mesa_ListBase( GLuint base );
+extern void GLAPIENTRY _mesa_NewList( GLuint list, GLenum mode );
 
-extern void _mesa_NewList( GLuint list, GLenum mode );
+extern void GLAPIENTRY _mesa_save_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
 
-extern void _mesa_init_dlist_table( struct _glapi_table *table,
-                                    GLuint tableSize );
+extern void GLAPIENTRY _mesa_save_CallList( GLuint list );
 
-extern void _mesa_save_error( GLcontext *ctx, GLenum error, const char *s );
+
+
+extern void _mesa_init_dlist_table( struct _glapi_table *table );
 
 extern void _mesa_compile_error( GLcontext *ctx, GLenum error, const char *s );
 
 
-extern void *_mesa_alloc_instruction( GLcontext *ctx, int opcode, GLint sz );
+extern void *_mesa_alloc_instruction(GLcontext *ctx, GLuint opcode, GLuint sz);
 
-extern int _mesa_alloc_opcode( GLcontext *ctx, GLuint sz,
-                               void (*execute)( GLcontext *, void * ),
-                               void (*destroy)( GLcontext *, void * ),
-                               void (*print)( GLcontext *, void * ) );
+extern GLint _mesa_alloc_opcode( GLcontext *ctx, GLuint sz,
+                                 void (*execute)( GLcontext *, void * ),
+                                 void (*destroy)( GLcontext *, void * ),
+                                 void (*print)( GLcontext *, void * ) );
 
-extern void _mesa_save_EvalMesh2(GLenum mode, GLint i1, GLint i2,
-                                GLint j1, GLint j2 );
-extern void _mesa_save_EvalMesh1( GLenum mode, GLint i1, GLint i2 );
-extern void _mesa_save_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
-extern void _mesa_save_CallList( GLuint list );
 extern void _mesa_init_display_list( GLcontext * ctx );
 
-#else
+extern void _mesa_save_vtxfmt_init( GLvertexformat *vfmt );
 
-/** No-op */
-#define _mesa_init_lists() ((void)0)
 
-/** No-op */
-#define _mesa_destroy_list(c,l) ((void)0)
+#else
 
 /** No-op */
 #define _mesa_init_dlist_table(t,ts) ((void)0)
@@ -94,6 +88,9 @@ extern void _mesa_init_display_list( GLcontext * ctx );
 /** No-op */
 #define _mesa_init_display_list(c) ((void)0)
 
+/** No-op */
+#define _mesa_save_vtxfmt_init(v) ((void)0)
+
 #endif
 
 #endif