xserver mesa xkbcomp libxcb git update 21 jan 2011

1 files changed, 173 insertions, 173 deletions

diff --git a/mesalib/src/mesa/vbo/vbo.h b/mesalib/src/mesa/vbo/vbo.h
index 20c7429da..37940efdc 100644
--- a/mesalib/src/mesa/vbo/vbo.h
+++ b/mesalib/src/mesa/vbo/vbo.h
@@ -1,173 +1,173 @@
-/*

- * mesa 3-D graphics library

- * Version:  6.5

- *

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

- */

-

-/**

- * \file vbo_context.h

- * \brief VBO builder module datatypes and definitions.

- * \author Keith Whitwell

- */

-

-

-#ifndef _VBO_H

-#define _VBO_H

-

-#include "main/glheader.h"

-

-struct gl_client_array;

-struct gl_context;

-

-struct _mesa_prim {

-   GLuint mode:8;

-   GLuint indexed:1;

-   GLuint begin:1;

-   GLuint end:1;

-   GLuint weak:1;

-   GLuint no_current_update:1;

-   GLuint pad:19;

-

-   GLuint start;

-   GLuint count;

-   GLint basevertex;

-   GLsizei num_instances;

-};

-

-/* Would like to call this a "vbo_index_buffer", but this would be

- * confusing as the indices are not neccessarily yet in a non-null

- * buffer object.

- */

-struct _mesa_index_buffer {

-   GLuint count;

-   GLenum type;

-   struct gl_buffer_object *obj;

-   const void *ptr;

-};

-

-

-

-GLboolean _vbo_CreateContext( struct gl_context *ctx );

-void _vbo_DestroyContext( struct gl_context *ctx );

-void _vbo_InvalidateState( struct gl_context *ctx, GLuint new_state );

-

-

-typedef void (*vbo_draw_func)( struct gl_context *ctx,

-			       const struct gl_client_array **arrays,

-			       const struct _mesa_prim *prims,

-			       GLuint nr_prims,

-			       const struct _mesa_index_buffer *ib,

-			       GLboolean index_bounds_valid,

-			       GLuint min_index,

-			       GLuint max_index );

-

-

-

-

-/* Utility function to cope with various constraints on tnl modules or

- * hardware.  This can be used to split an incoming set of arrays and

- * primitives against the following constraints:

- *    - Maximum number of indices in index buffer.

- *    - Maximum number of vertices referenced by index buffer.

- *    - Maximum hardware vertex buffer size.

- */

-struct split_limits {

-   GLuint max_verts;

-   GLuint max_indices;

-   GLuint max_vb_size;		/* bytes */

-};

-

-

-void vbo_split_prims( struct gl_context *ctx,

-		      const struct gl_client_array *arrays[],

-		      const struct _mesa_prim *prim,

-		      GLuint nr_prims,

-		      const struct _mesa_index_buffer *ib,

-		      GLuint min_index,

-		      GLuint max_index,

-		      vbo_draw_func draw,

-		      const struct split_limits *limits );

-

-

-/* Helpers for dealing translating away non-zero min_index.

- */

-GLboolean vbo_all_varyings_in_vbos( const struct gl_client_array *arrays[] );

-GLboolean vbo_any_varyings_in_vbos( const struct gl_client_array *arrays[] );

-

-void vbo_rebase_prims( struct gl_context *ctx,

-		       const struct gl_client_array *arrays[],

-		       const struct _mesa_prim *prim,

-		       GLuint nr_prims,

-		       const struct _mesa_index_buffer *ib,

-		       GLuint min_index,

-		       GLuint max_index,

-		       vbo_draw_func draw );

-void

-vbo_get_minmax_index(struct gl_context *ctx, const struct _mesa_prim *prim,

-		     const struct _mesa_index_buffer *ib,

-		     GLuint *min_index, GLuint *max_index);

-

-void vbo_use_buffer_objects(struct gl_context *ctx);

-

-

-void vbo_set_draw_func(struct gl_context *ctx, vbo_draw_func func);

-

-

-void GLAPIENTRY

-_es_Color4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a);

-

-void GLAPIENTRY

-_es_Normal3f(GLfloat x, GLfloat y, GLfloat z);

-

-void GLAPIENTRY

-_es_MultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);

-

-void GLAPIENTRY

-_es_Materialfv(GLenum face, GLenum pname, const GLfloat *params);

-

-void GLAPIENTRY

-_es_Materialf(GLenum face, GLenum pname, GLfloat param);

-

-void GLAPIENTRY

-_es_VertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);

-

-void GLAPIENTRY

-_es_VertexAttrib1f(GLuint indx, GLfloat x);

-

-void GLAPIENTRY

-_es_VertexAttrib1fv(GLuint indx, const GLfloat* values);

-

-void GLAPIENTRY

-_es_VertexAttrib2f(GLuint indx, GLfloat x, GLfloat y);

-

-void GLAPIENTRY

-_es_VertexAttrib2fv(GLuint indx, const GLfloat* values);

-

-void GLAPIENTRY

-_es_VertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z);

-

-void GLAPIENTRY

-_es_VertexAttrib3fv(GLuint indx, const GLfloat* values);

-

-void GLAPIENTRY

-_es_VertexAttrib4fv(GLuint indx, const GLfloat* values);

-

-#endif

+/*
+ * mesa 3-D graphics library
+ * Version:  6.5
+ *
+ * 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.
+ */
+
+/**
+ * \file vbo_context.h
+ * \brief VBO builder module datatypes and definitions.
+ * \author Keith Whitwell
+ */
+
+
+#ifndef _VBO_H
+#define _VBO_H
+
+#include "main/glheader.h"
+
+struct gl_client_array;
+struct gl_context;
+
+struct _mesa_prim {
+   GLuint mode:8;    /**< GL_POINTS, GL_LINES, GL_QUAD_STRIP, etc */
+   GLuint indexed:1;
+   GLuint begin:1;
+   GLuint end:1;
+   GLuint weak:1;
+   GLuint no_current_update:1;
+   GLuint pad:19;
+
+   GLuint start;
+   GLuint count;
+   GLint basevertex;
+   GLsizei num_instances;
+};
+
+/* Would like to call this a "vbo_index_buffer", but this would be
+ * confusing as the indices are not neccessarily yet in a non-null
+ * buffer object.
+ */
+struct _mesa_index_buffer {
+   GLuint count;
+   GLenum type;
+   struct gl_buffer_object *obj;
+   const void *ptr;
+};
+
+
+
+GLboolean _vbo_CreateContext( struct gl_context *ctx );
+void _vbo_DestroyContext( struct gl_context *ctx );
+void _vbo_InvalidateState( struct gl_context *ctx, GLuint new_state );
+
+
+typedef void (*vbo_draw_func)( struct gl_context *ctx,
+			       const struct gl_client_array **arrays,
+			       const struct _mesa_prim *prims,
+			       GLuint nr_prims,
+			       const struct _mesa_index_buffer *ib,
+			       GLboolean index_bounds_valid,
+			       GLuint min_index,
+			       GLuint max_index );
+
+
+
+
+/* Utility function to cope with various constraints on tnl modules or
+ * hardware.  This can be used to split an incoming set of arrays and
+ * primitives against the following constraints:
+ *    - Maximum number of indices in index buffer.
+ *    - Maximum number of vertices referenced by index buffer.
+ *    - Maximum hardware vertex buffer size.
+ */
+struct split_limits {
+   GLuint max_verts;
+   GLuint max_indices;
+   GLuint max_vb_size;		/* bytes */
+};
+
+
+void vbo_split_prims( struct gl_context *ctx,
+		      const struct gl_client_array *arrays[],
+		      const struct _mesa_prim *prim,
+		      GLuint nr_prims,
+		      const struct _mesa_index_buffer *ib,
+		      GLuint min_index,
+		      GLuint max_index,
+		      vbo_draw_func draw,
+		      const struct split_limits *limits );
+
+
+/* Helpers for dealing translating away non-zero min_index.
+ */
+GLboolean vbo_all_varyings_in_vbos( const struct gl_client_array *arrays[] );
+GLboolean vbo_any_varyings_in_vbos( const struct gl_client_array *arrays[] );
+
+void vbo_rebase_prims( struct gl_context *ctx,
+		       const struct gl_client_array *arrays[],
+		       const struct _mesa_prim *prim,
+		       GLuint nr_prims,
+		       const struct _mesa_index_buffer *ib,
+		       GLuint min_index,
+		       GLuint max_index,
+		       vbo_draw_func draw );
+void
+vbo_get_minmax_index(struct gl_context *ctx, const struct _mesa_prim *prim,
+		     const struct _mesa_index_buffer *ib,
+		     GLuint *min_index, GLuint *max_index);
+
+void vbo_use_buffer_objects(struct gl_context *ctx);
+
+
+void vbo_set_draw_func(struct gl_context *ctx, vbo_draw_func func);
+
+
+void GLAPIENTRY
+_es_Color4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a);
+
+void GLAPIENTRY
+_es_Normal3f(GLfloat x, GLfloat y, GLfloat z);
+
+void GLAPIENTRY
+_es_MultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+
+void GLAPIENTRY
+_es_Materialfv(GLenum face, GLenum pname, const GLfloat *params);
+
+void GLAPIENTRY
+_es_Materialf(GLenum face, GLenum pname, GLfloat param);
+
+void GLAPIENTRY
+_es_VertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+
+void GLAPIENTRY
+_es_VertexAttrib1f(GLuint indx, GLfloat x);
+
+void GLAPIENTRY
+_es_VertexAttrib1fv(GLuint indx, const GLfloat* values);
+
+void GLAPIENTRY
+_es_VertexAttrib2f(GLuint indx, GLfloat x, GLfloat y);
+
+void GLAPIENTRY
+_es_VertexAttrib2fv(GLuint indx, const GLfloat* values);
+
+void GLAPIENTRY
+_es_VertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z);
+
+void GLAPIENTRY
+_es_VertexAttrib3fv(GLuint indx, const GLfloat* values);
+
+void GLAPIENTRY
+_es_VertexAttrib4fv(GLuint indx, const GLfloat* values);
+
+#endif