svn merge ^/branches/released .

1 files changed, 244 insertions, 241 deletions

diff --git a/mesalib/src/mesa/main/varray.h b/mesalib/src/mesa/main/varray.h
index c7c3e3ec7..5e25c4e2f 100644
--- a/mesalib/src/mesa/main/varray.h
+++ b/mesalib/src/mesa/main/varray.h
@@ -1,241 +1,244 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.6
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- * 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 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 VARRAY_H
-#define VARRAY_H
-
-
-#include "mtypes.h"
-
-#if _HAVE_FULL_GL
-
-extern void GLAPIENTRY
-_mesa_VertexPointer(GLint size, GLenum type, GLsizei stride,
-                    const GLvoid *ptr);
-
-extern void GLAPIENTRY
-_mesa_UnlockArraysEXT( void );
-
-extern void GLAPIENTRY
-_mesa_LockArraysEXT(GLint first, GLsizei count);
-
-
-extern void GLAPIENTRY
-_mesa_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride,
-                      const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_VertexPointerEXT(GLint size, GLenum type, GLsizei stride,
-                       GLsizei count, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_NormalPointerEXT(GLenum type, GLsizei stride, GLsizei count,
-                       const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_ColorPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count,
-                      const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_IndexPointerEXT(GLenum type, GLsizei stride, GLsizei count,
-                      const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_TexCoordPointerEXT(GLint size, GLenum type, GLsizei stride,
-                         GLsizei count, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_EdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
-			       GLsizei stride, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_PointSizePointer(GLenum type, GLsizei stride, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type,
-                            GLsizei stride, const GLvoid *pointer);
-
-
-extern void GLAPIENTRY
-_mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
-                             GLboolean normalized, GLsizei stride,
-                             const GLvoid *pointer);
-
-void GLAPIENTRY
-_mesa_VertexAttribIPointer(GLuint index, GLint size, GLenum type,
-                           GLboolean normalized,
-                           GLsizei stride, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_EnableVertexAttribArrayARB(GLuint index);
-
-
-extern void GLAPIENTRY
-_mesa_DisableVertexAttribArrayARB(GLuint index);
-
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params);
-
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params);
-
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribivARB(GLuint index, GLenum pname, GLint *params);
-
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribIiv(GLuint index, GLenum pname, GLint *params);
-
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params);
-
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribPointervARB(GLuint index, GLenum pname, GLvoid **pointer);
-
-
-extern void GLAPIENTRY
-_mesa_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer);
-
-
-extern void GLAPIENTRY
-_mesa_MultiDrawArraysEXT( GLenum mode, const GLint *first,
-                          const GLsizei *count, GLsizei primcount );
-
-extern void GLAPIENTRY
-_mesa_MultiDrawElementsEXT( GLenum mode, const GLsizei *count, GLenum type,
-                            const GLvoid **indices, GLsizei primcount );
-
-extern void GLAPIENTRY
-_mesa_MultiDrawElementsBaseVertex( GLenum mode,
-				   const GLsizei *count, GLenum type,
-				   const GLvoid **indices, GLsizei primcount,
-				   const GLint *basevertex);
-
-extern void GLAPIENTRY
-_mesa_MultiModeDrawArraysIBM( const GLenum * mode, const GLint * first,
-			      const GLsizei * count,
-			      GLsizei primcount, GLint modestride );
-
-
-extern void GLAPIENTRY
-_mesa_MultiModeDrawElementsIBM( const GLenum * mode, const GLsizei * count,
-				GLenum type, const GLvoid * const * indices,
-				GLsizei primcount, GLint modestride );
-
-extern void GLAPIENTRY
-_mesa_LockArraysEXT(GLint first, GLsizei count);
-
-extern void GLAPIENTRY
-_mesa_UnlockArraysEXT( void );
-
-
-extern void GLAPIENTRY
-_mesa_DrawArrays(GLenum mode, GLint first, GLsizei count);
-
-extern void GLAPIENTRY
-_mesa_DrawElements(GLenum mode, GLsizei count, GLenum type,
-                   const GLvoid *indices);
-
-extern void GLAPIENTRY
-_mesa_DrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count,
-                        GLenum type, const GLvoid *indices);
-
-extern void GLAPIENTRY
-_mesa_DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type,
-			     const GLvoid *indices, GLint basevertex);
-
-extern void GLAPIENTRY
-_mesa_DrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end,
-				  GLsizei count, GLenum type,
-				  const GLvoid *indices,
-				  GLint basevertex);
-
-extern void GLAPIENTRY
-_mesa_PrimitiveRestartIndex(GLuint index);
-
-
-extern void
-_mesa_copy_client_array(GLcontext *ctx,
-                        struct gl_client_array *dst,
-                        struct gl_client_array *src);
-
-
-extern void
-_mesa_print_arrays(GLcontext *ctx);
-
-extern void
-_mesa_init_varray( GLcontext * ctx );
-
-extern void 
-_mesa_free_varray_data(GLcontext *ctx);
-
-#else
-
-/** No-op */
-#define _mesa_init_varray( c )  ((void)0)
-#define _mesa_free_varray_data( c )  ((void)0)
-
-#endif
-
-#endif
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.6

+ *

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

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

+#define VARRAY_H

+

+

+#include "glheader.h"

+#include "mfeatures.h"

+

+struct gl_client_array;

+struct gl_context;

+

+#if _HAVE_FULL_GL

+

+extern void GLAPIENTRY

+_mesa_VertexPointer(GLint size, GLenum type, GLsizei stride,

+                    const GLvoid *ptr);

+

+extern void GLAPIENTRY

+_mesa_UnlockArraysEXT( void );

+

+extern void GLAPIENTRY

+_mesa_LockArraysEXT(GLint first, GLsizei count);

+

+

+extern void GLAPIENTRY

+_mesa_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride,

+                      const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_VertexPointerEXT(GLint size, GLenum type, GLsizei stride,

+                       GLsizei count, const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_NormalPointerEXT(GLenum type, GLsizei stride, GLsizei count,

+                       const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_ColorPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count,

+                      const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_IndexPointerEXT(GLenum type, GLsizei stride, GLsizei count,

+                      const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_TexCoordPointerEXT(GLint size, GLenum type, GLsizei stride,

+                         GLsizei count, const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_EdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_SecondaryColorPointerEXT(GLint size, GLenum type,

+			       GLsizei stride, const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_PointSizePointer(GLenum type, GLsizei stride, const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type,

+                            GLsizei stride, const GLvoid *pointer);

+

+

+extern void GLAPIENTRY

+_mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,

+                             GLboolean normalized, GLsizei stride,

+                             const GLvoid *pointer);

+

+void GLAPIENTRY

+_mesa_VertexAttribIPointer(GLuint index, GLint size, GLenum type,

+                           GLsizei stride, const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_EnableVertexAttribArrayARB(GLuint index);

+

+

+extern void GLAPIENTRY

+_mesa_DisableVertexAttribArrayARB(GLuint index);

+

+

+extern void GLAPIENTRY

+_mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params);

+

+

+extern void GLAPIENTRY

+_mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params);

+

+

+extern void GLAPIENTRY

+_mesa_GetVertexAttribivARB(GLuint index, GLenum pname, GLint *params);

+

+

+extern void GLAPIENTRY

+_mesa_GetVertexAttribIiv(GLuint index, GLenum pname, GLint *params);

+

+

+extern void GLAPIENTRY

+_mesa_GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params);

+

+

+extern void GLAPIENTRY

+_mesa_GetVertexAttribPointervARB(GLuint index, GLenum pname, GLvoid **pointer);

+

+

+extern void GLAPIENTRY

+_mesa_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer);

+

+

+extern void GLAPIENTRY

+_mesa_MultiDrawArraysEXT( GLenum mode, const GLint *first,

+                          const GLsizei *count, GLsizei primcount );

+

+extern void GLAPIENTRY

+_mesa_MultiDrawElementsEXT( GLenum mode, const GLsizei *count, GLenum type,

+                            const GLvoid **indices, GLsizei primcount );

+

+extern void GLAPIENTRY

+_mesa_MultiDrawElementsBaseVertex( GLenum mode,

+				   const GLsizei *count, GLenum type,

+				   const GLvoid **indices, GLsizei primcount,

+				   const GLint *basevertex);

+

+extern void GLAPIENTRY

+_mesa_MultiModeDrawArraysIBM( const GLenum * mode, const GLint * first,

+			      const GLsizei * count,

+			      GLsizei primcount, GLint modestride );

+

+

+extern void GLAPIENTRY

+_mesa_MultiModeDrawElementsIBM( const GLenum * mode, const GLsizei * count,

+				GLenum type, const GLvoid * const * indices,

+				GLsizei primcount, GLint modestride );

+

+extern void GLAPIENTRY

+_mesa_LockArraysEXT(GLint first, GLsizei count);

+

+extern void GLAPIENTRY

+_mesa_UnlockArraysEXT( void );

+

+

+extern void GLAPIENTRY

+_mesa_DrawArrays(GLenum mode, GLint first, GLsizei count);

+

+extern void GLAPIENTRY

+_mesa_DrawElements(GLenum mode, GLsizei count, GLenum type,

+                   const GLvoid *indices);

+

+extern void GLAPIENTRY

+_mesa_DrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count,

+                        GLenum type, const GLvoid *indices);

+

+extern void GLAPIENTRY

+_mesa_DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type,

+			     const GLvoid *indices, GLint basevertex);

+

+extern void GLAPIENTRY

+_mesa_DrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end,

+				  GLsizei count, GLenum type,

+				  const GLvoid *indices,

+				  GLint basevertex);

+

+extern void GLAPIENTRY

+_mesa_PrimitiveRestartIndex(GLuint index);

+

+

+extern void

+_mesa_copy_client_array(struct gl_context *ctx,

+                        struct gl_client_array *dst,

+                        struct gl_client_array *src);

+

+

+extern void

+_mesa_print_arrays(struct gl_context *ctx);

+

+extern void

+_mesa_init_varray( struct gl_context * ctx );

+

+extern void 

+_mesa_free_varray_data(struct gl_context *ctx);

+

+#else

+

+/** No-op */

+#define _mesa_init_varray( c )  ((void)0)

+#define _mesa_free_varray_data( c )  ((void)0)

+

+#endif

+

+#endif