X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fdlist.h;h=89008431a884a927a304bea9061eb5712d55d365;hb=79463f18ac91b2b0f1ed6dcdb26f84b942543d80;hp=1945ac29440948c8aa8d2271239aab8eccf77e10;hpb=4360bd7c76a2c972da761fb82913f88e014a8edf;p=mesa.git

diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h
index 1945ac29440..89008431a88 100644
--- a/src/mesa/main/dlist.h
+++ b/src/mesa/main/dlist.h
@@ -1,21 +1,24 @@
-/* $Id: dlist.h,v 1.5 2000/09/15 17:04:35 brianp Exp $ */
+/**
+ * \file dlist.h
+ * Display lists management.
+ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
- * 
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
- * 
+ * Version:  6.5.1
+ *
+ * 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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * 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
@@ -25,45 +28,77 @@
  */
 
 
+
 #ifndef DLIST_H
 #define DLIST_H
 
 
-#include "types.h"
+#include "main/mfeatures.h"
+#include "main/mtypes.h"
+
+
+#if FEATURE_dlist
+
+#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 _mesa_compile_error( struct gl_context *ctx, GLenum error, const char *s );
 
+extern void *_mesa_dlist_alloc(struct gl_context *ctx, GLuint opcode, GLuint sz);
 
-struct display_list {
-   union node *nodes;	
-   GLuint OrFlag;
-   struct gl_current_attrib outputs;
-};
+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(struct gl_context *ctx, struct gl_display_list *dlist);
 
-extern void gl_init_lists( void );
+extern void _mesa_save_vtxfmt_init( GLvertexformat *vfmt );
 
-extern void gl_destroy_list( GLcontext *ctx, GLuint list );
+extern struct _glapi_table *_mesa_create_save_table(void);
 
-extern void _mesa_CallList( GLuint list );
+extern void _mesa_install_dlist_vtxfmt(struct _glapi_table *disp,
+                                       const GLvertexformat *vfmt);
 
-extern void _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
+extern void _mesa_init_dlist_dispatch(struct _glapi_table *disp);
 
-extern void _mesa_DeleteLists( GLuint list, GLsizei range );
+#else /* FEATURE_dlist */
 
-extern void _mesa_EndList( void );
+#include "main/compiler.h"
 
-extern GLuint _mesa_GenLists( GLsizei range );
+#define _MESA_INIT_DLIST_VTXFMT(vfmt, impl) do { } while (0)
 
-extern GLboolean _mesa_IsList( GLuint list );
+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();
+}
 
-extern void _mesa_ListBase( GLuint base );
+static inline void
+_mesa_install_dlist_vtxfmt(struct _glapi_table *disp,
+                           const GLvertexformat *vfmt)
+{
+}
 
-extern void _mesa_NewList( GLuint list, GLenum mode );
+static inline void
+_mesa_init_dlist_dispatch(struct _glapi_table *disp)
+{
+}
 
-extern void _mesa_init_dlist_table( struct _glapi_table *table, GLuint tableSize );
+#endif /* FEATURE_dlist */
 
-extern void gl_compile_cassette( GLcontext *ctx );
+extern void _mesa_init_display_list( struct gl_context * ctx );
 
-extern void gl_save_error( GLcontext *ctx, GLenum error, const char *s );
+extern void _mesa_free_display_list_data(struct gl_context *ctx);
 
 
-#endif
+#endif /* DLIST_H */