Merge branch 'mesa_7_5_branch' into dlist-statechange-shortcircuit

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

diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h
index 098468fd176f0d7dc5538333eac265c1df57ffbb..ab7ec2c8db33cd6bead555cc53fe751a1e85d9e6 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,7 +38,8 @@
 
 #if _HAVE_FULL_GL
 
-extern void _mesa_destroy_list( GLcontext *ctx, GLuint list );
+extern void
+_mesa_delete_list(GLcontext *ctx, struct gl_display_list *dlist);
 
 extern void GLAPIENTRY _mesa_CallList( GLuint list );
 
@@ -64,8 +65,6 @@ 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_compile_error( GLcontext *ctx, GLenum error, const char *s );
 
 
@@ -83,9 +82,6 @@ extern void _mesa_save_vtxfmt_init( GLvertexformat *vfmt );
 
 #else
 
-/** No-op */
-#define _mesa_destroy_list(c,l) ((void)0)
-
 /** No-op */
 #define _mesa_init_dlist_table(t,ts) ((void)0)