mesa: use _mesa_memcpy for COPY_4FV macro

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

diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h
index cbe8a4b47c2a95e3f62ab80657a9fc1aa8c2775f..f37a93a7f4bf4e6631bcdc1f0f72900e2b641747 100644 (file)
--- a/src/mesa/main/dlist.h
+++ b/src/mesa/main/dlist.h
@@ -1,21 +1,24 @@
-/* $Id: dlist.h,v 1.7 2000/11/16 21:05:34 keithw 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,46 +28,85 @@
  */
 
 
+
 #ifndef DLIST_H
 #define DLIST_H
 
 
-#include "types.h"
+#include "main/mtypes.h"
+
+
+#if FEATURE_dlist
+
+#define _MESA_INIT_DLIST_FUNCTIONS(driver, impl)               \
+   do {                                                        \
+      (driver)->NewList           = impl ## NewList;           \
+      (driver)->EndList           = impl ## EndList;           \
+      (driver)->BeginCallList     = impl ## BeginCallList;     \
+      (driver)->EndCallList       = impl ## EndCallList;       \
+      (driver)->SaveFlushVertices = impl ## SaveFlushVertices; \
+      (driver)->NotifySaveBegin   = impl ## NotifyBegin;       \
+   } while (0)
+
+#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( GLcontext *ctx, GLenum error, const char *s );
 
-extern void gl_init_lists( void );
+extern void *_mesa_dlist_alloc(GLcontext *ctx, GLuint opcode, GLuint sz);
 
-extern void gl_destroy_list( GLcontext *ctx, GLuint list );
+extern GLint _mesa_dlist_alloc_opcode( GLcontext *ctx, GLuint sz,
+                                       void (*execute)( GLcontext *, void * ),
+                                       void (*destroy)( GLcontext *, void * ),
+                                       void (*print)( GLcontext *, void * ) );
 
-extern void _mesa_CallList( GLuint list );
+extern void _mesa_delete_list(GLcontext *ctx, struct gl_display_list *dlist);
 
-extern void _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
+extern void _mesa_save_vtxfmt_init( GLvertexformat *vfmt );
 
-extern void _mesa_DeleteLists( GLuint list, GLsizei range );
+extern void _mesa_init_save_table( struct _glapi_table *table );
 
-extern void _mesa_EndList( void );
+extern void _mesa_install_dlist_vtxfmt(struct _glapi_table *disp,
+                                       const GLvertexformat *vfmt);
 
-extern GLuint _mesa_GenLists( GLsizei range );
+extern void _mesa_init_dlist_dispatch(struct _glapi_table *disp);
 
-extern GLboolean _mesa_IsList( GLuint list );
+#else /* FEATURE_dlist */
 
-extern void _mesa_ListBase( GLuint base );
+#define _MESA_INIT_DLIST_FUNCTIONS(driver, impl) do { } while (0)
+#define _MESA_INIT_DLIST_VTXFMT(vfmt, impl) do { } while (0)
 
-extern void _mesa_NewList( GLuint list, GLenum mode );
+static INLINE void
+_mesa_delete_list(GLcontext *ctx, struct gl_display_list *dlist)
+{
+   /* there should be no list to delete */
+   ASSERT_NO_FEATURE();
+}
 
-extern void _mesa_init_dlist_table( struct _glapi_table *table, GLuint tableSize );
+static INLINE void
+_mesa_install_dlist_vtxfmt(struct _glapi_table *disp,
+                           const GLvertexformat *vfmt)
+{
+}
 
-extern void gl_save_error( GLcontext *ctx, GLenum error, const char *s );
+static INLINE void
+_mesa_init_dlist_dispatch(struct _glapi_table *disp)
+{
+}
 
+#endif /* FEATURE_dlist */
 
-void *
-_mesa_alloc_instruction( GLcontext *ctx, int opcode, GLint sz );
+extern void _mesa_init_display_list( GLcontext * ctx );
 
-int
-_mesa_alloc_opcode( GLcontext *ctx, GLuint sz, 
-                   void (*execute)( GLcontext *, void * ),
-                   void (*destroy)( GLcontext *, void * ),
-                   void (*print)( GLcontext *, void * ) );
+extern void _mesa_free_display_list_data(GLcontext *ctx);
 
 
-#endif
+#endif /* DLIST_H */