X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fdlist.h;h=ab7ec2c8db33cd6bead555cc53fe751a1e85d9e6;hb=727b2d747e13fed78bf62cfbf4a31427eed0ef29;hp=987c2cbab6505e67fcc05b0dd70db8169e1e1c81;hpb=5fb84d263b8068467a2429942ecf113a0a4c8a60;p=mesa.git

diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h
index 987c2cbab65..ab7ec2c8db3 100644
--- a/src/mesa/main/dlist.h
+++ b/src/mesa/main/dlist.h
@@ -1,21 +1,24 @@
-/* $Id: dlist.h,v 1.4 2000/05/24 15:04:45 brianp Exp $ */
+/**
+ * \file dlist.h
+ * Display lists management.
+ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.3
- * 
- * 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,51 +28,69 @@
  */
 
 
+
 #ifndef DLIST_H
 #define DLIST_H
 
 
-#include "types.h"
+#include "mtypes.h"
+
+
+#if _HAVE_FULL_GL
+
+extern void
+_mesa_delete_list(GLcontext *ctx, struct gl_display_list *dlist);
+
+extern void GLAPIENTRY _mesa_CallList( GLuint list );
+
+extern void GLAPIENTRY _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
 
+extern void GLAPIENTRY _mesa_DeleteLists( GLuint list, GLsizei range );
 
-struct display_list {
-   union node *nodes;	
-   GLuint OrFlag;
-   struct gl_current_attrib outputs;
-};
+extern void GLAPIENTRY _mesa_EndList( void );
 
-struct display_list_compilation {
-   struct display_list *list;
-   union node *current_block;
-   GLuint current_pos;
-};
+extern GLuint GLAPIENTRY _mesa_GenLists( GLsizei range );
 
+extern GLboolean GLAPIENTRY _mesa_IsList( GLuint list );
 
-extern void gl_init_lists( void );
+extern void GLAPIENTRY _mesa_ListBase( GLuint base );
 
-extern void gl_destroy_list( GLcontext *ctx, GLuint list );
+extern void GLAPIENTRY _mesa_NewList( GLuint list, GLenum mode );
 
-extern void _mesa_CallList( GLuint list );
+extern void GLAPIENTRY _mesa_save_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
 
-extern void _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
+extern void GLAPIENTRY _mesa_save_CallList( GLuint list );
 
-extern void _mesa_DeleteLists( GLuint list, GLsizei range );
 
-extern void _mesa_EndList( void );
 
-extern GLuint _mesa_GenLists( GLsizei range );
+extern void _mesa_init_dlist_table( struct _glapi_table *table );
 
-extern GLboolean _mesa_IsList( GLuint list );
+extern void _mesa_compile_error( GLcontext *ctx, GLenum error, const char *s );
 
-extern void _mesa_ListBase( GLuint base );
 
-extern void _mesa_NewList( GLuint list, GLenum mode );
+extern void *_mesa_alloc_instruction(GLcontext *ctx, GLuint opcode, GLuint sz);
 
-extern void _mesa_init_dlist_table( struct _glapi_table *table, GLuint tableSize );
+extern GLint _mesa_alloc_opcode( GLcontext *ctx, GLuint sz,
+                                 void (*execute)( GLcontext *, void * ),
+                                 void (*destroy)( GLcontext *, void * ),
+                                 void (*print)( GLcontext *, void * ) );
 
-extern void gl_compile_cassette( GLcontext *ctx );
+extern void _mesa_init_display_list( GLcontext * ctx );
 
-extern void gl_save_error( GLcontext *ctx, GLenum error, const char *s );
+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