mesa: Rename _mesa_..._array_obj functions to _mesa_..._vao.

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

diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h
index ef6a10af8322b18faff6c6154fa92238f52e7d99..7726e77d84a4c60ebbb5989fd2e09e066a6837b0 100644 (file)
--- a/src/mesa/main/dlist.h
+++ b/src/mesa/main/dlist.h
@@ -5,7 +5,6 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.1
  *
  * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
  *
@@ -22,9 +21,10 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 
@@ -33,64 +33,48 @@
 #define DLIST_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 
-#if _HAVE_FULL_GL
+GLboolean GLAPIENTRY
+_mesa_IsList(GLuint list);
+void GLAPIENTRY
+_mesa_DeleteLists(GLuint list, GLsizei range);
+GLuint GLAPIENTRY
+_mesa_GenLists(GLsizei range);
+void GLAPIENTRY
+_mesa_NewList(GLuint name, GLenum mode);
+void GLAPIENTRY
+_mesa_EndList(void);
+void GLAPIENTRY
+_mesa_CallList( GLuint list );
+void GLAPIENTRY
+_mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
+void GLAPIENTRY
+_mesa_ListBase(GLuint base);
 
-extern void
-_mesa_delete_list(GLcontext *ctx, struct mesa_display_list *dlist);
+extern struct gl_display_list *
+_mesa_lookup_list(struct gl_context *ctx, GLuint list);
 
-extern void GLAPIENTRY _mesa_CallList( GLuint list );
+extern void _mesa_compile_error( struct gl_context *ctx, GLenum error, const char *s );
 
-extern void GLAPIENTRY _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
+extern void *_mesa_dlist_alloc(struct gl_context *ctx, GLuint opcode, GLuint sz);
 
-extern void GLAPIENTRY _mesa_DeleteLists( GLuint list, GLsizei range );
+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_EndList( void );
+extern void _mesa_delete_list(struct gl_context *ctx, struct gl_display_list *dlist);
 
-extern GLuint GLAPIENTRY _mesa_GenLists( GLsizei range );
+extern void _mesa_initialize_save_table(const struct gl_context *);
 
-extern GLboolean GLAPIENTRY _mesa_IsList( GLuint list );
+extern void _mesa_install_dlist_vtxfmt(struct _glapi_table *disp,
+                                       const GLvertexformat *vfmt);
 
-extern void GLAPIENTRY _mesa_ListBase( GLuint base );
+extern void _mesa_init_display_list( struct gl_context * ctx );
 
-extern void GLAPIENTRY _mesa_NewList( GLuint list, GLenum mode );
+extern void _mesa_free_display_list_data(struct gl_context *ctx);
 
-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_compile_error( GLcontext *ctx, GLenum error, const char *s );
-
-
-extern void *_mesa_alloc_instruction(GLcontext *ctx, GLuint opcode, GLuint sz);
-
-extern GLint _mesa_alloc_opcode( GLcontext *ctx, GLuint sz,
-                                 void (*execute)( GLcontext *, void * ),
-                                 void (*destroy)( GLcontext *, void * ),
-                                 void (*print)( GLcontext *, void * ) );
-
-extern void _mesa_init_display_list( GLcontext * ctx );
-
-extern void _mesa_save_vtxfmt_init( GLvertexformat *vfmt );
-
-
-#else
-
-/** No-op */
-#define _mesa_init_dlist_table(t,ts) ((void)0)
-
-/** No-op */
-#define _mesa_init_display_list(c) ((void)0)
-
-/** No-op */
-#define _mesa_save_vtxfmt_init(v) ((void)0)
-
-#endif
-
-#endif
+#endif /* DLIST_H */