xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011

1 files changed, 208 insertions, 193 deletions

diff --git a/mesalib/src/mesa/main/uniforms.h b/mesalib/src/mesa/main/uniforms.h
index 3a85144fa..b024cb30b 100644
--- a/mesalib/src/mesa/main/uniforms.h
+++ b/mesalib/src/mesa/main/uniforms.h
@@ -1,193 +1,208 @@
-/*

- * Mesa 3-D graphics library

- *

- * Copyright (C) 2010  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

- * THE AUTHORS 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 UNIFORMS_H

-#define UNIFORMS_H

-

-#include "glheader.h"

-#include "program/prog_parameter.h"

-

-struct gl_program;

-struct _glapi_table;

-

-extern void GLAPIENTRY

-_mesa_Uniform1fARB(GLint, GLfloat);

-

-extern void GLAPIENTRY

-_mesa_Uniform2fARB(GLint, GLfloat, GLfloat);

-

-extern void GLAPIENTRY

-_mesa_Uniform3fARB(GLint, GLfloat, GLfloat, GLfloat);

-

-extern void GLAPIENTRY

-_mesa_Uniform4fARB(GLint, GLfloat, GLfloat, GLfloat, GLfloat);

-

-extern void GLAPIENTRY

-_mesa_Uniform1iARB(GLint, GLint);

-

-extern void GLAPIENTRY

-_mesa_Uniform2iARB(GLint, GLint, GLint);

-

-extern void GLAPIENTRY

-_mesa_Uniform3iARB(GLint, GLint, GLint, GLint);

-

-extern void GLAPIENTRY

-_mesa_Uniform4iARB(GLint, GLint, GLint, GLint, GLint);

-

-extern void GLAPIENTRY

-_mesa_Uniform1fvARB(GLint, GLsizei, const GLfloat *);

-

-extern void GLAPIENTRY

-_mesa_Uniform2fvARB(GLint, GLsizei, const GLfloat *);

-

-extern void GLAPIENTRY

-_mesa_Uniform3fvARB(GLint, GLsizei, const GLfloat *);

-

-extern void GLAPIENTRY

-_mesa_Uniform4fvARB(GLint, GLsizei, const GLfloat *);

-

-extern void GLAPIENTRY

-_mesa_Uniform1ivARB(GLint, GLsizei, const GLint *);

-

-extern void GLAPIENTRY

-_mesa_Uniform2ivARB(GLint, GLsizei, const GLint *);

-

-extern void GLAPIENTRY

-_mesa_Uniform3ivARB(GLint, GLsizei, const GLint *);

-

-extern void GLAPIENTRY

-_mesa_Uniform4ivARB(GLint, GLsizei, const GLint *);

-

-extern void GLAPIENTRY

-_mesa_Uniform1ui(GLint location, GLuint v0);

-

-extern void GLAPIENTRY

-_mesa_Uniform2ui(GLint location, GLuint v0, GLuint v1);

-

-extern void GLAPIENTRY

-_mesa_Uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2);

-

-extern void GLAPIENTRY

-_mesa_Uniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);

-

-extern void GLAPIENTRY

-_mesa_Uniform1uiv(GLint location, GLsizei count, const GLuint *value);

-

-extern void GLAPIENTRY

-_mesa_Uniform2uiv(GLint location, GLsizei count, const GLuint *value);

-

-extern void GLAPIENTRY

-_mesa_Uniform3uiv(GLint location, GLsizei count, const GLuint *value);

-

-extern void GLAPIENTRY

-_mesa_Uniform4uiv(GLint location, GLsizei count, const GLuint *value);

-

-

-extern void GLAPIENTRY

-_mesa_UniformMatrix2fvARB(GLint, GLsizei, GLboolean, const GLfloat *);

-

-extern void GLAPIENTRY

-_mesa_UniformMatrix3fvARB(GLint, GLsizei, GLboolean, const GLfloat *);

-

-extern void GLAPIENTRY

-_mesa_UniformMatrix4fvARB(GLint, GLsizei, GLboolean, const GLfloat *);

-

-extern void GLAPIENTRY

-_mesa_UniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose,

-                         const GLfloat *value);

-

-extern void GLAPIENTRY

-_mesa_UniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose,

-                         const GLfloat *value);

-

-extern void GLAPIENTRY

-_mesa_UniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose,

-                         const GLfloat *value);

-

-extern void GLAPIENTRY

-_mesa_UniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose,

-                         const GLfloat *value);

-

-extern void GLAPIENTRY

-_mesa_UniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose,

-                         const GLfloat *value);

-

-extern void GLAPIENTRY

-_mesa_UniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose,

-                         const GLfloat *value);

-

-

-extern void GLAPIENTRY

-_mesa_GetActiveUniformARB(GLhandleARB, GLuint, GLsizei, GLsizei *,

-                          GLint *, GLenum *, GLcharARB *);

-

-extern void GLAPIENTRY

-_mesa_GetUniformfvARB(GLhandleARB, GLint, GLfloat *);

-

-extern void GLAPIENTRY

-_mesa_GetUniformivARB(GLhandleARB, GLint, GLint *);

-

-extern void GLAPIENTRY

-_mesa_GetUniformuiv(GLhandleARB program, GLint location, GLuint *params);

-

-extern GLint GLAPIENTRY

-_mesa_GetUniformLocationARB(GLhandleARB, const GLcharARB *);

-

-GLint

-_mesa_get_uniform_location(struct gl_context *ctx, struct gl_shader_program *shProg,

-			   const GLchar *name);

-

-void

-_mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shader_program,

-	      GLint location, GLsizei count,

-              const GLvoid *values, GLenum type);

-

-void

-_mesa_uniform_matrix(struct gl_context *ctx, struct gl_shader_program *shProg,

-		     GLint cols, GLint rows,

-                     GLint location, GLsizei count,

-                     GLboolean transpose, const GLfloat *values);

-

-extern void

-_mesa_update_shader_textures_used(struct gl_program *prog);

-

-

-extern void

-_mesa_init_shader_uniform_dispatch(struct _glapi_table *exec);

-

-struct gl_builtin_uniform_element {

-   const char *field;

-   int tokens[STATE_LENGTH];

-   int swizzle;

-};

-

-struct gl_builtin_uniform_desc {

-   const char *name;

-   struct gl_builtin_uniform_element *elements;

-   unsigned int num_elements;

-};

-

-extern const struct gl_builtin_uniform_desc _mesa_builtin_uniform_desc[];

-

-#endif /* UNIFORMS_H */

+/*
+ * Mesa 3-D graphics library
+ *
+ * Copyright (C) 2010  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
+ * THE AUTHORS 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 UNIFORMS_H
+#define UNIFORMS_H
+
+#include "glheader.h"
+#include "program/prog_parameter.h"
+
+struct gl_program;
+struct _glapi_table;
+
+extern void GLAPIENTRY
+_mesa_Uniform1fARB(GLint, GLfloat);
+
+extern void GLAPIENTRY
+_mesa_Uniform2fARB(GLint, GLfloat, GLfloat);
+
+extern void GLAPIENTRY
+_mesa_Uniform3fARB(GLint, GLfloat, GLfloat, GLfloat);
+
+extern void GLAPIENTRY
+_mesa_Uniform4fARB(GLint, GLfloat, GLfloat, GLfloat, GLfloat);
+
+extern void GLAPIENTRY
+_mesa_Uniform1iARB(GLint, GLint);
+
+extern void GLAPIENTRY
+_mesa_Uniform2iARB(GLint, GLint, GLint);
+
+extern void GLAPIENTRY
+_mesa_Uniform3iARB(GLint, GLint, GLint, GLint);
+
+extern void GLAPIENTRY
+_mesa_Uniform4iARB(GLint, GLint, GLint, GLint, GLint);
+
+extern void GLAPIENTRY
+_mesa_Uniform1fvARB(GLint, GLsizei, const GLfloat *);
+
+extern void GLAPIENTRY
+_mesa_Uniform2fvARB(GLint, GLsizei, const GLfloat *);
+
+extern void GLAPIENTRY
+_mesa_Uniform3fvARB(GLint, GLsizei, const GLfloat *);
+
+extern void GLAPIENTRY
+_mesa_Uniform4fvARB(GLint, GLsizei, const GLfloat *);
+
+extern void GLAPIENTRY
+_mesa_Uniform1ivARB(GLint, GLsizei, const GLint *);
+
+extern void GLAPIENTRY
+_mesa_Uniform2ivARB(GLint, GLsizei, const GLint *);
+
+extern void GLAPIENTRY
+_mesa_Uniform3ivARB(GLint, GLsizei, const GLint *);
+
+extern void GLAPIENTRY
+_mesa_Uniform4ivARB(GLint, GLsizei, const GLint *);
+
+extern void GLAPIENTRY
+_mesa_Uniform1ui(GLint location, GLuint v0);
+
+extern void GLAPIENTRY
+_mesa_Uniform2ui(GLint location, GLuint v0, GLuint v1);
+
+extern void GLAPIENTRY
+_mesa_Uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2);
+
+extern void GLAPIENTRY
+_mesa_Uniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+
+extern void GLAPIENTRY
+_mesa_Uniform1uiv(GLint location, GLsizei count, const GLuint *value);
+
+extern void GLAPIENTRY
+_mesa_Uniform2uiv(GLint location, GLsizei count, const GLuint *value);
+
+extern void GLAPIENTRY
+_mesa_Uniform3uiv(GLint location, GLsizei count, const GLuint *value);
+
+extern void GLAPIENTRY
+_mesa_Uniform4uiv(GLint location, GLsizei count, const GLuint *value);
+
+
+extern void GLAPIENTRY
+_mesa_UniformMatrix2fvARB(GLint, GLsizei, GLboolean, const GLfloat *);
+
+extern void GLAPIENTRY
+_mesa_UniformMatrix3fvARB(GLint, GLsizei, GLboolean, const GLfloat *);
+
+extern void GLAPIENTRY
+_mesa_UniformMatrix4fvARB(GLint, GLsizei, GLboolean, const GLfloat *);
+
+extern void GLAPIENTRY
+_mesa_UniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose,
+                         const GLfloat *value);
+
+extern void GLAPIENTRY
+_mesa_UniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose,
+                         const GLfloat *value);
+
+extern void GLAPIENTRY
+_mesa_UniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose,
+                         const GLfloat *value);
+
+extern void GLAPIENTRY
+_mesa_UniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose,
+                         const GLfloat *value);
+
+extern void GLAPIENTRY
+_mesa_UniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose,
+                         const GLfloat *value);
+
+extern void GLAPIENTRY
+_mesa_UniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose,
+                         const GLfloat *value);
+
+
+extern void GLAPIENTRY
+_mesa_GetActiveUniformARB(GLhandleARB, GLuint, GLsizei, GLsizei *,
+                          GLint *, GLenum *, GLcharARB *);
+
+extern void GLAPIENTRY
+_mesa_GetUniformfvARB(GLhandleARB, GLint, GLfloat *);
+
+extern void GLAPIENTRY
+_mesa_GetnUniformfvARB(GLhandleARB, GLint, GLsizei, GLfloat *);
+
+extern void GLAPIENTRY
+_mesa_GetUniformivARB(GLhandleARB, GLint, GLint *);
+
+extern void GLAPIENTRY
+_mesa_GetnUniformivARB(GLhandleARB, GLint, GLsizei, GLint *);
+
+extern void GLAPIENTRY
+_mesa_GetUniformuiv(GLhandleARB, GLint, GLuint *);
+
+extern void GLAPIENTRY
+_mesa_GetnUniformuivARB(GLhandleARB, GLint, GLsizei, GLuint *);
+
+extern void GLAPIENTRY
+_mesa_GetUniformdv(GLhandleARB, GLint, GLdouble *);
+
+extern void GLAPIENTRY
+_mesa_GetnUniformdvARB(GLhandleARB, GLint, GLsizei, GLdouble *);
+
+extern GLint GLAPIENTRY
+_mesa_GetUniformLocationARB(GLhandleARB, const GLcharARB *);
+
+GLint
+_mesa_get_uniform_location(struct gl_context *ctx, struct gl_shader_program *shProg,
+			   const GLchar *name);
+
+void
+_mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shader_program,
+	      GLint location, GLsizei count,
+              const GLvoid *values, GLenum type);
+
+void
+_mesa_uniform_matrix(struct gl_context *ctx, struct gl_shader_program *shProg,
+		     GLint cols, GLint rows,
+                     GLint location, GLsizei count,
+                     GLboolean transpose, const GLfloat *values);
+
+extern void
+_mesa_update_shader_textures_used(struct gl_program *prog);
+
+
+extern void
+_mesa_init_shader_uniform_dispatch(struct _glapi_table *exec);
+
+struct gl_builtin_uniform_element {
+   const char *field;
+   int tokens[STATE_LENGTH];
+   int swizzle;
+};
+
+struct gl_builtin_uniform_desc {
+   const char *name;
+   struct gl_builtin_uniform_element *elements;
+   unsigned int num_elements;
+};
+
+extern const struct gl_builtin_uniform_desc _mesa_builtin_uniform_desc[];
+
+#endif /* UNIFORMS_H */