mkfontscale pixman xserver xtrans libX11 libXdmcp libxcb libXmu mesa git update 5 oct 2011

1 files changed, 104 insertions, 104 deletions

diff --git a/mesalib/src/mesa/main/dlist.h b/mesalib/src/mesa/main/dlist.h
index b954e06df..89008431a 100644
--- a/mesalib/src/mesa/main/dlist.h
+++ b/mesalib/src/mesa/main/dlist.h
@@ -1,104 +1,104 @@
-/**

- * \file dlist.h

- * Display lists management.

- */

-

-/*

- * Mesa 3-D graphics library

- * 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

- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- */

-

-

-

-#ifndef DLIST_H

-#define DLIST_H

-

-

-#include "main/mfeatures.h"

-#include "main/mtypes.h"

-

-

-#if FEATURE_dlist

-

-#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( struct gl_context *ctx, GLenum error, const char *s );

-

-extern void *_mesa_dlist_alloc(struct gl_context *ctx, GLuint opcode, GLuint sz);

-

-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_delete_list(struct gl_context *ctx, struct gl_display_list *dlist);

-

-extern void _mesa_save_vtxfmt_init( GLvertexformat *vfmt );

-

-extern struct _glapi_table *_mesa_create_save_table(void);

-

-extern void _mesa_install_dlist_vtxfmt(struct _glapi_table *disp,

-                                       const GLvertexformat *vfmt);

-

-extern void _mesa_init_dlist_dispatch(struct _glapi_table *disp);

-

-#else /* FEATURE_dlist */

-

-#include "main/compiler.h"

-

-#define _MESA_INIT_DLIST_VTXFMT(vfmt, impl) do { } while (0)

-

-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)

-{

-}

-

-static INLINE void

-_mesa_init_dlist_dispatch(struct _glapi_table *disp)

-{

-}

-

-#endif /* FEATURE_dlist */

-

-extern void _mesa_init_display_list( struct gl_context * ctx );

-

-extern void _mesa_free_display_list_data(struct gl_context *ctx);

-

-

-#endif /* DLIST_H */

+/**
+ * \file dlist.h
+ * Display lists management.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * 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
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+
+#ifndef DLIST_H
+#define DLIST_H
+
+
+#include "main/mfeatures.h"
+#include "main/mtypes.h"
+
+
+#if FEATURE_dlist
+
+#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( struct gl_context *ctx, GLenum error, const char *s );
+
+extern void *_mesa_dlist_alloc(struct gl_context *ctx, GLuint opcode, GLuint sz);
+
+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_delete_list(struct gl_context *ctx, struct gl_display_list *dlist);
+
+extern void _mesa_save_vtxfmt_init( GLvertexformat *vfmt );
+
+extern struct _glapi_table *_mesa_create_save_table(void);
+
+extern void _mesa_install_dlist_vtxfmt(struct _glapi_table *disp,
+                                       const GLvertexformat *vfmt);
+
+extern void _mesa_init_dlist_dispatch(struct _glapi_table *disp);
+
+#else /* FEATURE_dlist */
+
+#include "main/compiler.h"
+
+#define _MESA_INIT_DLIST_VTXFMT(vfmt, impl) do { } while (0)
+
+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)
+{
+}
+
+static inline void
+_mesa_init_dlist_dispatch(struct _glapi_table *disp)
+{
+}
+
+#endif /* FEATURE_dlist */
+
+extern void _mesa_init_display_list( struct gl_context * ctx );
+
+extern void _mesa_free_display_list_data(struct gl_context *ctx);
+
+
+#endif /* DLIST_H */