Merge commit 'origin/gallium-0.1' into gallium-0.2

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

diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h
index 1945ac29440948c8aa8d2271239aab8eccf77e10..ef6a10af8322b18faff6c6154fa92238f52e7d99 100644 (file)
--- 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,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 mesa_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 );
 
+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_compile_cassette( GLcontext *ctx );
+extern GLint _mesa_alloc_opcode( GLcontext *ctx, GLuint sz,
+                                 void (*execute)( GLcontext *, void * ),
+                                 void (*destroy)( GLcontext *, void * ),
+                                 void (*print)( GLcontext *, void * ) );
 
-extern void gl_save_error( GLcontext *ctx, GLenum error, const char *s );
+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