xserver and mesa git update 28-12-2010

1 files changed, 85 insertions, 83 deletions

diff --git a/mesalib/src/mesa/main/arrayobj.h b/mesalib/src/mesa/main/arrayobj.h
index fdf7e2bca..44f771417 100644
--- a/mesalib/src/mesa/main/arrayobj.h
+++ b/mesalib/src/mesa/main/arrayobj.h
@@ -1,83 +1,85 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.6
- *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
- * (C) Copyright IBM Corporation 2006
- * Copyright (C) 2009  VMware, Inc.  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 OR IBM 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 ARRAYOBJ_H
-#define ARRAYOBJ_H
-
-#include "mtypes.h"
-
-/**
- * \file arrayobj.h
- * Functions for the GL_APPLE_vertex_array_object extension.
- *
- * \author Ian Romanick <idr@us.ibm.com>
- * \author Brian Paul
- */
-
-/*
- * Internal functions
- */
-
-extern struct gl_array_object *
-_mesa_new_array_object( GLcontext *ctx, GLuint name );
-
-extern void
-_mesa_delete_array_object( GLcontext *ctx, struct gl_array_object *obj );
-
-extern void
-_mesa_reference_array_object(GLcontext *ctx,
-                             struct gl_array_object **ptr,
-                             struct gl_array_object *arrayObj);
-
-extern void
-_mesa_initialize_array_object( GLcontext *ctx,
-                               struct gl_array_object *obj, GLuint name );
-
-
-extern void
-_mesa_update_array_object_max_element(GLcontext *ctx,
-                                      struct gl_array_object *arrayObj);
-
-
-/*
- * API functions
- */
-
-
-void GLAPIENTRY _mesa_BindVertexArray( GLuint id );
-
-void GLAPIENTRY _mesa_BindVertexArrayAPPLE( GLuint id );
-
-void GLAPIENTRY _mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids);
-
-void GLAPIENTRY _mesa_GenVertexArrays(GLsizei n, GLuint *arrays);
-
-void GLAPIENTRY _mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *buffer);
-
-GLboolean GLAPIENTRY _mesa_IsVertexArrayAPPLE( GLuint id );
-
-#endif /* ARRAYOBJ_H */
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.6

+ *

+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.

+ * (C) Copyright IBM Corporation 2006

+ * Copyright (C) 2009  VMware, Inc.  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 OR IBM 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 ARRAYOBJ_H

+#define ARRAYOBJ_H

+

+#include "glheader.h"

+

+struct gl_context;

+

+/**

+ * \file arrayobj.h

+ * Functions for the GL_APPLE_vertex_array_object extension.

+ *

+ * \author Ian Romanick <idr@us.ibm.com>

+ * \author Brian Paul

+ */

+

+/*

+ * Internal functions

+ */

+

+extern struct gl_array_object *

+_mesa_new_array_object( struct gl_context *ctx, GLuint name );

+

+extern void

+_mesa_delete_array_object( struct gl_context *ctx, struct gl_array_object *obj );

+

+extern void

+_mesa_reference_array_object(struct gl_context *ctx,

+                             struct gl_array_object **ptr,

+                             struct gl_array_object *arrayObj);

+

+extern void

+_mesa_initialize_array_object( struct gl_context *ctx,

+                               struct gl_array_object *obj, GLuint name );

+

+

+extern void

+_mesa_update_array_object_max_element(struct gl_context *ctx,

+                                      struct gl_array_object *arrayObj);

+

+

+/*

+ * API functions

+ */

+

+

+void GLAPIENTRY _mesa_BindVertexArray( GLuint id );

+

+void GLAPIENTRY _mesa_BindVertexArrayAPPLE( GLuint id );

+

+void GLAPIENTRY _mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids);

+

+void GLAPIENTRY _mesa_GenVertexArrays(GLsizei n, GLuint *arrays);

+

+void GLAPIENTRY _mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *buffer);

+

+GLboolean GLAPIENTRY _mesa_IsVertexArrayAPPLE( GLuint id );

+

+#endif /* ARRAYOBJ_H */