Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
	mesalib/src/glsl/ast_function.cpp
	mesalib/src/glsl/ast_to_hir.cpp
	mesalib/src/glsl/glsl_types.cpp
	mesalib/src/glsl/ir.cpp
	mesalib/src/glsl/ir.h
	mesalib/src/glsl/linker.cpp
	mesalib/src/glsl/s_expression.cpp
	mesalib/src/mesa/drivers/common/driverfuncs.c
	mesalib/src/mesa/main/dd.h
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c

1 files changed, 111 insertions, 118 deletions

diff --git a/mesalib/src/mesa/drivers/common/meta.h b/mesalib/src/mesa/drivers/common/meta.h
index a350a92aa..95b4b5579 100644
--- a/mesalib/src/mesa/drivers/common/meta.h
+++ b/mesalib/src/mesa/drivers/common/meta.h
@@ -1,118 +1,111 @@
-/*

- * Mesa 3-D graphics library

- * Version:  7.6

- *

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

-#define META_H

-

-

-extern void

-_mesa_meta_init(struct gl_context *ctx);

-

-extern void

-_mesa_meta_free(struct gl_context *ctx);

-

-extern void

-_mesa_meta_BlitFramebuffer(struct gl_context *ctx,

-                           GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,

-                           GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,

-                           GLbitfield mask, GLenum filter);

-

-extern void

-_mesa_meta_Clear(struct gl_context *ctx, GLbitfield buffers);

-

-extern void

-_mesa_meta_CopyPixels(struct gl_context *ctx, GLint srcx, GLint srcy,

-                      GLsizei width, GLsizei height,

-                      GLint dstx, GLint dsty, GLenum type);

-

-extern void

-_mesa_meta_DrawPixels(struct gl_context *ctx,

-                      GLint x, GLint y, GLsizei width, GLsizei height,

-                      GLenum format, GLenum type,

-                      const struct gl_pixelstore_attrib *unpack,

-                      const GLvoid *pixels);

-

-extern void

-_mesa_meta_Bitmap(struct gl_context *ctx,

-                  GLint x, GLint y, GLsizei width, GLsizei height,

-                  const struct gl_pixelstore_attrib *unpack,

-                  const GLubyte *bitmap);

-

-extern GLboolean

-_mesa_meta_check_generate_mipmap_fallback(struct gl_context *ctx, GLenum target,

-                                          struct gl_texture_object *texObj);

-

-extern void

-_mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,

-                          struct gl_texture_object *texObj);

-

-extern void

-_mesa_meta_CopyTexImage1D(struct gl_context *ctx, GLenum target, GLint level,

-                          GLenum internalFormat, GLint x, GLint y,

-                          GLsizei width, GLint border);

-

-extern void

-_mesa_meta_CopyTexImage2D(struct gl_context *ctx, GLenum target, GLint level,

-                          GLenum internalFormat, GLint x, GLint y,

-                          GLsizei width, GLsizei height, GLint border);

-

-extern void

-_mesa_meta_CopyTexSubImage1D(struct gl_context *ctx, GLenum target, GLint level,

-                             GLint xoffset,

-                             GLint x, GLint y, GLsizei width);

-

-extern void

-_mesa_meta_CopyTexSubImage2D(struct gl_context *ctx, GLenum target, GLint level,

-                             GLint xoffset, GLint yoffset,

-                             GLint x, GLint y,

-                             GLsizei width, GLsizei height);

-

-extern void

-_mesa_meta_CopyTexSubImage3D(struct gl_context *ctx, GLenum target, GLint level,

-                             GLint xoffset, GLint yoffset, GLint zoffset,

-                             GLint x, GLint y,

-                             GLsizei width, GLsizei height);

-

-extern void

-_mesa_meta_CopyColorTable(struct gl_context *ctx,

-                          GLenum target, GLenum internalformat,

-                          GLint x, GLint y, GLsizei width);

-

-extern void

-_mesa_meta_CopyColorSubTable(struct gl_context *ctx,GLenum target, GLsizei start,

-                             GLint x, GLint y, GLsizei width);

-

-extern void

-_mesa_meta_CopyConvolutionFilter1D(struct gl_context *ctx, GLenum target,

-                                   GLenum internalFormat,

-                                   GLint x, GLint y, GLsizei width);

-

-extern void

-_mesa_meta_CopyConvolutionFilter2D(struct gl_context *ctx, GLenum target,

-                                   GLenum internalFormat, GLint x, GLint y,

-                                   GLsizei width, GLsizei height);

-

-

-#endif /* META_H */

+/*
+ * Mesa 3-D graphics library
+ * Version:  7.6
+ *
+ * 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 META_H
+#define META_H
+
+
+extern void
+_mesa_meta_init(struct gl_context *ctx);
+
+extern void
+_mesa_meta_free(struct gl_context *ctx);
+
+extern void
+_mesa_meta_BlitFramebuffer(struct gl_context *ctx,
+                           GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
+                           GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
+                           GLbitfield mask, GLenum filter);
+
+extern void
+_mesa_meta_Clear(struct gl_context *ctx, GLbitfield buffers);
+
+extern void
+_mesa_meta_glsl_Clear(struct gl_context *ctx, GLbitfield buffers);
+
+extern void
+_mesa_meta_CopyPixels(struct gl_context *ctx, GLint srcx, GLint srcy,
+                      GLsizei width, GLsizei height,
+                      GLint dstx, GLint dsty, GLenum type);
+
+extern void
+_mesa_meta_DrawPixels(struct gl_context *ctx,
+                      GLint x, GLint y, GLsizei width, GLsizei height,
+                      GLenum format, GLenum type,
+                      const struct gl_pixelstore_attrib *unpack,
+                      const GLvoid *pixels);
+
+extern void
+_mesa_meta_Bitmap(struct gl_context *ctx,
+                  GLint x, GLint y, GLsizei width, GLsizei height,
+                  const struct gl_pixelstore_attrib *unpack,
+                  const GLubyte *bitmap);
+
+extern GLboolean
+_mesa_meta_check_generate_mipmap_fallback(struct gl_context *ctx, GLenum target,
+                                          struct gl_texture_object *texObj);
+
+extern void
+_mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
+                          struct gl_texture_object *texObj);
+
+extern void
+_mesa_meta_CopyTexSubImage1D(struct gl_context *ctx, GLenum target, GLint level,
+                             GLint xoffset,
+                             GLint x, GLint y, GLsizei width);
+
+extern void
+_mesa_meta_CopyTexSubImage2D(struct gl_context *ctx, GLenum target, GLint level,
+                             GLint xoffset, GLint yoffset,
+                             GLint x, GLint y,
+                             GLsizei width, GLsizei height);
+
+extern void
+_mesa_meta_CopyTexSubImage3D(struct gl_context *ctx, GLenum target, GLint level,
+                             GLint xoffset, GLint yoffset, GLint zoffset,
+                             GLint x, GLint y,
+                             GLsizei width, GLsizei height);
+
+extern void
+_mesa_meta_CopyColorTable(struct gl_context *ctx,
+                          GLenum target, GLenum internalformat,
+                          GLint x, GLint y, GLsizei width);
+
+extern void
+_mesa_meta_CopyColorSubTable(struct gl_context *ctx,GLenum target, GLsizei start,
+                             GLint x, GLint y, GLsizei width);
+
+extern void
+_mesa_meta_CopyConvolutionFilter1D(struct gl_context *ctx, GLenum target,
+                                   GLenum internalFormat,
+                                   GLint x, GLint y, GLsizei width);
+
+extern void
+_mesa_meta_CopyConvolutionFilter2D(struct gl_context *ctx, GLenum target,
+                                   GLenum internalFormat, GLint x, GLint y,
+                                   GLsizei width, GLsizei height);
+
+
+#endif /* META_H */