X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fdlist.h;h=ab7ec2c8db33cd6bead555cc53fe751a1e85d9e6;hb=f0df08abbec173be183d3d6ecf3d4ba5206df179;hp=d43aed787bff56e323c7e11d403d06e483525c12;hpb=ab8b047ae59c111b4e4ab4fd43a2c6573caf5b85;p=mesa.git

diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h
index d43aed787bf..ab7ec2c8db3 100644
--- a/src/mesa/main/dlist.h
+++ b/src/mesa/main/dlist.h
@@ -1,10 +1,13 @@
-/* $Id: dlist.h,v 1.12 2001/01/13 18:28:20 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,6 +28,7 @@
  */
 
 
+
 #ifndef DLIST_H
 #define DLIST_H
 
@@ -32,71 +36,61 @@
 #include "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 _HAVE_FULL_GL
+
+extern void
+_mesa_delete_list(GLcontext *ctx, struct gl_display_list *dlist);
+
+extern void GLAPIENTRY _mesa_CallList( GLuint list );
 
-#define ASSERT_OUTSIDE_SAVE_BEGIN_END(ctx) \
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_WITH_RETVAL(ctx,)
+extern void GLAPIENTRY _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
 
-#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_DeleteLists( GLuint list, GLsizei range );
 
-#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_EndList( void );
 
+extern GLuint GLAPIENTRY _mesa_GenLists( GLsizei range );
 
-extern void gl_init_lists( void );
+extern GLboolean GLAPIENTRY _mesa_IsList( GLuint list );
 
-extern void gl_destroy_list( GLcontext *ctx, GLuint list );
+extern void GLAPIENTRY _mesa_ListBase( GLuint base );
 
-extern void _mesa_CallList( GLuint list );
+extern void GLAPIENTRY _mesa_NewList( GLuint list, GLenum mode );
 
-extern void _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
+extern void GLAPIENTRY _mesa_save_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
 
-extern void _mesa_DeleteLists( GLuint list, GLsizei range );
+extern void GLAPIENTRY _mesa_save_CallList( GLuint list );
 
-extern void _mesa_EndList( void );
 
-extern GLuint _mesa_GenLists( GLsizei range );
 
-extern GLboolean _mesa_IsList( GLuint list );
+extern void _mesa_init_dlist_table( struct _glapi_table *table );
 
-extern void _mesa_ListBase( GLuint base );
+extern void _mesa_compile_error( GLcontext *ctx, GLenum error, const char *s );
 
-extern void _mesa_NewList( GLuint list, GLenum mode );
 
-extern void _mesa_init_dlist_table( struct _glapi_table *table, GLuint tableSize );
+extern void *_mesa_alloc_instruction(GLcontext *ctx, GLuint opcode, GLuint sz);
 
-extern void gl_save_error( GLcontext *ctx, GLenum error, const char *s );
+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 );
 
-void *
-_mesa_alloc_instruction( GLcontext *ctx, int opcode, GLint sz );
+extern void _mesa_save_vtxfmt_init( GLvertexformat *vfmt );
 
-int
-_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 );
+#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