X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fdlist.h;h=89008431a884a927a304bea9061eb5712d55d365;hb=9d36c96d6ec9f2c05c8e0b9ef18c5462cddee8c1;hp=e2dea8926966c84bcc5a3f49e9cb81298616dd07;hpb=9ef50d5826c92aa7c9dd19702f18b0dfec59f03c;p=mesa.git

diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h
index e2dea892696..89008431a88 100644
--- a/src/mesa/main/dlist.h
+++ b/src/mesa/main/dlist.h
@@ -1,10 +1,13 @@
-/* $Id: dlist.h,v 1.11 2000/12/26 07:41:32 keithw Exp $ */
+/**
+ * \file dlist.h
+ * Display lists management.
+ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  6.5.1
  *
- * Copyright (C) 1999-2000  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"),
@@ -25,75 +28,77 @@
  */
 
 
+
 #ifndef DLIST_H
 #define DLIST_H
 
 
-#include "mtypes.h"
+#include "main/mfeatures.h"
+#include "main/mtypes.h"
 
 
-#define ASSERT_OUTSIDE_SAVE_BEGIN_END_WITH_RETVAL(ctx, retval)	\
-do {								\
-   if (ctx->Driver.CurrentSavePrimitive < GL_POLYGON+1 ||        \
-       ctx->Driver.CurrentSavePrimitive == PRIM_INSIDE_UNKNOWN_PRIM) {	\
-      _mesa_compile_error( ctx, GL_INVALID_OPERATION, "begin/end" );	\
-      return retval;						\
-   }								\
-} while (0)
+#if FEATURE_dlist
 
-#define ASSERT_OUTSIDE_SAVE_BEGIN_END(ctx) \
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_WITH_RETVAL(ctx,)
+#define _MESA_INIT_DLIST_VTXFMT(vfmt, impl)  \
+   do {                                      \
+      (vfmt)->CallList  = impl ## CallList;  \
+      (vfmt)->CallLists = impl ## CallLists; \
+   } while (0)
 
-#define ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx)	\
-do {							\
-   ASSERT_OUTSIDE_SAVE_BEGIN_END(ctx);			\
-   FLUSH_VERTICES(ctx, 0);				\
-} while (0)
+extern void GLAPIENTRY _mesa_CallList( GLuint list );
 
-#define ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx, retval)\
-do {									\
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_WITH_RETVAL(ctx, retval);		\
-   FLUSH_VERTICES(ctx, 0);						\
-} while (0)
+extern void GLAPIENTRY _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
 
 
-extern void gl_init_lists( void );
+extern void _mesa_compile_error( struct gl_context *ctx, GLenum error, const char *s );
 
-extern void gl_destroy_list( GLcontext *ctx, GLuint list );
+extern void *_mesa_dlist_alloc(struct gl_context *ctx, GLuint opcode, GLuint sz);
 
-extern void _mesa_CallList( 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 _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
+extern void _mesa_delete_list(struct gl_context *ctx, struct gl_display_list *dlist);
 
-extern void _mesa_DeleteLists( GLuint list, GLsizei range );
+extern void _mesa_save_vtxfmt_init( GLvertexformat *vfmt );
 
-extern void _mesa_EndList( void );
+extern struct _glapi_table *_mesa_create_save_table(void);
 
-extern GLuint _mesa_GenLists( GLsizei range );
+extern void _mesa_install_dlist_vtxfmt(struct _glapi_table *disp,
+                                       const GLvertexformat *vfmt);
 
-extern GLboolean _mesa_IsList( GLuint list );
+extern void _mesa_init_dlist_dispatch(struct _glapi_table *disp);
 
-extern void _mesa_ListBase( GLuint base );
+#else /* FEATURE_dlist */
 
-extern void _mesa_NewList( GLuint list, GLenum mode );
+#include "main/compiler.h"
 
-extern void _mesa_init_dlist_table( struct _glapi_table *table, GLuint tableSize );
+#define _MESA_INIT_DLIST_VTXFMT(vfmt, impl) do { } while (0)
 
-extern void gl_save_error( GLcontext *ctx, GLenum error, const char *s );
+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();
+}
 
+static inline void
+_mesa_install_dlist_vtxfmt(struct _glapi_table *disp,
+                           const GLvertexformat *vfmt)
+{
+}
 
-void *
-_mesa_alloc_instruction( GLcontext *ctx, int opcode, GLint sz );
+static inline void
+_mesa_init_dlist_dispatch(struct _glapi_table *disp)
+{
+}
 
-int
-_mesa_alloc_opcode( GLcontext *ctx, GLuint sz,
-		    void (*execute)( GLcontext *, void * ),
-		    void (*destroy)( GLcontext *, void * ),
-		    void (*print)( GLcontext *, void * ) );
+#endif /* FEATURE_dlist */
 
-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_init_display_list( struct gl_context * ctx );
 
+extern void _mesa_free_display_list_data(struct gl_context *ctx);
 
 
-#endif
+#endif /* DLIST_H */