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

9 files changed, 335 insertions, 404 deletions

diff --git a/mesalib/src/mesa/drivers/common/driverfuncs.c b/mesalib/src/mesa/drivers/common/driverfuncs.c
index 4806d5d67..a2687d7c3 100644
--- a/mesalib/src/mesa/drivers/common/driverfuncs.c
+++ b/mesalib/src/mesa/drivers/common/driverfuncs.c
@@ -95,8 +95,6 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    driver->TexSubImage2D = _mesa_store_texsubimage2d;

    driver->TexSubImage3D = _mesa_store_texsubimage3d;

    driver->GetTexImage = _mesa_get_teximage;

-   driver->CopyTexImage1D = _mesa_meta_CopyTexImage1D;

-   driver->CopyTexImage2D = _mesa_meta_CopyTexImage2D;

    driver->CopyTexSubImage1D = _mesa_meta_CopyTexSubImage1D;

    driver->CopyTexSubImage2D = _mesa_meta_CopyTexSubImage2D;

    driver->CopyTexSubImage3D = _mesa_meta_CopyTexSubImage3D;

diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c
index 0e58aeca3..fa78674e4 100644
--- a/mesalib/src/mesa/drivers/common/meta.c
+++ b/mesalib/src/mesa/drivers/common/meta.c
@@ -62,6 +62,7 @@
 #include "main/teximage.h"
 #include "main/texparam.h"
 #include "main/texstate.h"
+#include "main/uniforms.h"
 #include "main/varray.h"
 #include "main/viewport.h"
 #include "program/program.h"
@@ -235,6 +236,8 @@ struct clear_state
 {
    GLuint ArrayObj;
    GLuint VBO;
+   GLuint ShaderProg;
+   GLint ColorLocation;
 };
 
 
@@ -1589,10 +1592,165 @@ _mesa_meta_Clear(struct gl_context *ctx, GLbitfield buffers)
    _mesa_meta_end(ctx);
 }
 
+static void
+meta_glsl_clear_init(struct gl_context *ctx, struct clear_state *clear)
+{
+   const char *vs_source =
+      "attribute vec4 position;\n"
+      "void main()\n"
+      "{\n"
+      "   gl_Position = position;\n"
+      "}\n";
+   const char *fs_source =
+      "uniform vec4 color;\n"
+      "void main()\n"
+      "{\n"
+      "   gl_FragColor = color;\n"
+      "}\n";
+   GLuint vs, fs;
+
+   if (clear->ArrayObj != 0)
+      return;
+
+   /* create vertex array object */
+   _mesa_GenVertexArrays(1, &clear->ArrayObj);
+   _mesa_BindVertexArray(clear->ArrayObj);
+
+   /* create vertex array buffer */
+   _mesa_GenBuffersARB(1, &clear->VBO);
+   _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, clear->VBO);
+
+   /* setup vertex arrays */
+   _mesa_VertexAttribPointerARB(0, 3, GL_FLOAT, GL_FALSE, 0, (void *)0);
+   _mesa_EnableVertexAttribArrayARB(0);
+
+   vs = _mesa_CreateShaderObjectARB(GL_VERTEX_SHADER);
+   _mesa_ShaderSourceARB(vs, 1, &vs_source, NULL);
+   _mesa_CompileShaderARB(vs);
+
+   fs = _mesa_CreateShaderObjectARB(GL_FRAGMENT_SHADER);
+   _mesa_ShaderSourceARB(fs, 1, &fs_source, NULL);
+   _mesa_CompileShaderARB(fs);
+
+   clear->ShaderProg = _mesa_CreateProgramObjectARB();
+   _mesa_AttachShader(clear->ShaderProg, fs);
+   _mesa_AttachShader(clear->ShaderProg, vs);
+   _mesa_BindAttribLocationARB(clear->ShaderProg, 0, "position");
+   _mesa_LinkProgramARB(clear->ShaderProg);
+
+   clear->ColorLocation = _mesa_GetUniformLocationARB(clear->ShaderProg,
+						      "color");
+}
+
+/**
+ * Meta implementation of ctx->Driver.Clear() in terms of polygon rendering.
+ */
+void
+_mesa_meta_glsl_Clear(struct gl_context *ctx, GLbitfield buffers)
+{
+   struct clear_state *clear = &ctx->Meta->Clear;
+   GLbitfield metaSave;
+   const GLuint stencilMax = (1 << ctx->DrawBuffer->Visual.stencilBits) - 1;
+   struct gl_framebuffer *fb = ctx->DrawBuffer;
+   const float x0 = ((float)fb->_Xmin / fb->Width)  * 2.0f - 1.0f;
+   const float y0 = ((float)fb->_Ymin / fb->Height) * 2.0f - 1.0f;
+   const float x1 = ((float)fb->_Xmax / fb->Width)  * 2.0f - 1.0f;
+   const float y1 = ((float)fb->_Ymax / fb->Height) * 2.0f - 1.0f;
+   const float z = -invert_z(ctx->Depth.Clear);
+   struct vertex {
+      GLfloat x, y, z;
+   } verts[4];
+
+   metaSave = (META_ALPHA_TEST |
+	       META_BLEND |
+	       META_DEPTH_TEST |
+	       META_RASTERIZATION |
+	       META_SHADER |
+	       META_STENCIL_TEST |
+	       META_VERTEX |
+	       META_VIEWPORT |
+	       META_CLAMP_FRAGMENT_COLOR);
+
+   if (!(buffers & BUFFER_BITS_COLOR)) {
+      /* We'll use colormask to disable color writes.  Otherwise,
+       * respect color mask
+       */
+      metaSave |= META_COLOR_MASK;
+   }
+
+   _mesa_meta_begin(ctx, metaSave);
+
+   meta_glsl_clear_init(ctx, clear);
+
+   _mesa_UseProgramObjectARB(clear->ShaderProg);
+   _mesa_Uniform4fvARB(clear->ColorLocation, 1,
+		       ctx->Color.ClearColorUnclamped);
+
+   _mesa_BindVertexArray(clear->ArrayObj);
+   _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, clear->VBO);
+
+   /* GL_COLOR_BUFFER_BIT */
+   if (buffers & BUFFER_BITS_COLOR) {
+      /* leave colormask, glDrawBuffer state as-is */
+
+      /* Clears never have the color clamped. */
+      _mesa_ClampColorARB(GL_CLAMP_FRAGMENT_COLOR, GL_FALSE);
+   }
+   else {
+      ASSERT(metaSave & META_COLOR_MASK);
+      _mesa_ColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
+   }
+
+   /* GL_DEPTH_BUFFER_BIT */
+   if (buffers & BUFFER_BIT_DEPTH) {
+      _mesa_set_enable(ctx, GL_DEPTH_TEST, GL_TRUE);
+      _mesa_DepthFunc(GL_ALWAYS);
+      _mesa_DepthMask(GL_TRUE);
+   }
+   else {
+      assert(!ctx->Depth.Test);
+   }
+
+   /* GL_STENCIL_BUFFER_BIT */
+   if (buffers & BUFFER_BIT_STENCIL) {
+      _mesa_set_enable(ctx, GL_STENCIL_TEST, GL_TRUE);
+      _mesa_StencilOpSeparate(GL_FRONT_AND_BACK,
+                              GL_REPLACE, GL_REPLACE, GL_REPLACE);
+      _mesa_StencilFuncSeparate(GL_FRONT_AND_BACK, GL_ALWAYS,
+                                ctx->Stencil.Clear & stencilMax,
+                                ctx->Stencil.WriteMask[0]);
+   }
+   else {
+      assert(!ctx->Stencil.Enabled);
+   }
+
+   /* vertex positions */
+   verts[0].x = x0;
+   verts[0].y = y0;
+   verts[0].z = z;
+   verts[1].x = x1;
+   verts[1].y = y0;
+   verts[1].z = z;
+   verts[2].x = x1;
+   verts[2].y = y1;
+   verts[2].z = z;
+   verts[3].x = x0;
+   verts[3].y = y1;
+   verts[3].z = z;
+
+   /* upload new vertex data */
+   _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts), verts,
+		       GL_DYNAMIC_DRAW_ARB);
+
+   /* draw quad */
+   _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);
+
+   _mesa_meta_end(ctx);
+}
 
 /**
  * Meta implementation of ctx->Driver.CopyPixels() in terms
- * of texture mapping and polygon rendering.
+ * of texture mapping and polygon rendering and GLSL shaders.
  */
 void
 _mesa_meta_CopyPixels(struct gl_context *ctx, GLint srcX, GLint srcY,
@@ -2678,119 +2836,6 @@ get_temp_image_type(struct gl_context *ctx, GLenum baseFormat)
 
 
 /**
- * Helper for _mesa_meta_CopyTexImage1/2D() functions.
- * Have to be careful with locking and meta state for pixel transfer.
- */
-static void
-copy_tex_image(struct gl_context *ctx, GLuint dims, GLenum target, GLint level,
-               GLenum internalFormat, GLint x, GLint y,
-               GLsizei width, GLsizei height, GLint border)
-{
-   struct gl_texture_object *texObj;
-   struct gl_texture_image *texImage;
-   GLenum format, type;
-   GLint bpp;
-   void *buf;
-   struct gl_renderbuffer *read_rb = ctx->ReadBuffer->_ColorReadBuffer;
-
-   texObj = _mesa_get_current_tex_object(ctx, target);
-   texImage = _mesa_get_tex_image(ctx, texObj, target, level);
-
-   /* Choose format/type for temporary image buffer */
-   format = _mesa_base_tex_format(ctx, internalFormat);
-
-   if (format == GL_LUMINANCE &&
-       _mesa_get_format_base_format(read_rb->Format) != GL_LUMINANCE) {
-      /* The glReadPixels() path will convert RGB to luminance by
-       * summing R+G+B.  glCopyTexImage() is supposed to behave as
-       * glCopyPixels, which doesn't do that change, and instead
-       * leaves it up to glTexImage which converts RGB to luminance by
-       * just taking the R channel.  To avoid glReadPixels() trashing
-       * our data, use RGBA for our temporary image.
-       */
-      format = GL_RGBA;
-   }
-
-   type = get_temp_image_type(ctx, format);
-   bpp = _mesa_bytes_per_pixel(format, type);
-   if (bpp <= 0) {
-      _mesa_problem(ctx, "Bad bpp in meta copy_tex_image()");
-      return;
-   }
-
-   /*
-    * Alloc image buffer (XXX could use a PBO)
-    */
-   buf = malloc(width * height * bpp);
-   if (!buf) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyTexImage%uD", dims);
-      return;
-   }
-
-   _mesa_unlock_texture(ctx, texObj); /* need to unlock first */
-
-   /*
-    * Read image from framebuffer (disable pixel transfer ops)
-    */
-   _mesa_meta_begin(ctx, META_PIXEL_STORE | META_PIXEL_TRANSFER);
-   ctx->Driver.ReadPixels(ctx, x, y, width, height,
-			  format, type, &ctx->Pack, buf);
-   _mesa_meta_end(ctx);
-
-   if (texImage->Data) {
-      ctx->Driver.FreeTexImageData(ctx, texImage);
-   }
-
-   /* The texture's format was already chosen in _mesa_CopyTexImage() */
-   ASSERT(texImage->TexFormat != MESA_FORMAT_NONE);
-
-   /*
-    * Store texture data (with pixel transfer ops)
-    */
-   _mesa_meta_begin(ctx, META_PIXEL_STORE);
-
-   _mesa_update_state(ctx); /* to update pixel transfer state */
-
-   if (target == GL_TEXTURE_1D) {
-      ctx->Driver.TexImage1D(ctx, target, level, internalFormat,
-                             width, border, format, type,
-                             buf, &ctx->Unpack, texObj, texImage);
-   }
-   else {
-      ctx->Driver.TexImage2D(ctx, target, level, internalFormat,
-                             width, height, border, format, type,
-                             buf, &ctx->Unpack, texObj, texImage);
-   }
-   _mesa_meta_end(ctx);
-
-   _mesa_lock_texture(ctx, texObj); /* re-lock */
-
-   free(buf);
-}
-
-
-void
-_mesa_meta_CopyTexImage1D(struct gl_context *ctx, GLenum target, GLint level,
-                          GLenum internalFormat, GLint x, GLint y,
-                          GLsizei width, GLint border)
-{
-   copy_tex_image(ctx, 1, target, level, internalFormat, x, y,
-                  width, 1, border);
-}
-
-
-void
-_mesa_meta_CopyTexImage2D(struct gl_context *ctx, GLenum target, GLint level,
-                          GLenum internalFormat, GLint x, GLint y,
-                          GLsizei width, GLsizei height, GLint border)
-{
-   copy_tex_image(ctx, 2, target, level, internalFormat, x, y,
-                  width, height, border);
-}
-
-
-
-/**
  * Helper for _mesa_meta_CopyTexSubImage1/2/3D() functions.
  * Have to be careful with locking and meta state for pixel transfer.
  */
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 */
diff --git a/mesalib/src/mesa/main/dd.h b/mesalib/src/mesa/main/dd.h
index d16b14b6a..aae68439a 100644
--- a/mesalib/src/mesa/main/dd.h
+++ b/mesalib/src/mesa/main/dd.h
@@ -189,31 +189,22 @@ struct dd_function_table {
    /*@{*/

 

    /**

-    * Choose texture format.

-    * 

-    * This is called by the \c _mesa_store_tex[sub]image[123]d() fallback

-    * functions.  The driver should examine \p internalFormat and return a

-    * gl_format value.

+    * Choose actual hardware texture format given the user-provided source

+    * image format and type and the desired internal format.  In some

+    * cases, srcFormat and srcType can be GL_NONE.

+    * Called by glTexImage(), etc.

     */

    GLuint (*ChooseTextureFormat)( struct gl_context *ctx, GLint internalFormat,

                                      GLenum srcFormat, GLenum srcType );

 

    /**

-    * Called by glTexImage1D().

-    * 

-    * \param target user specified.

-    * \param format user specified.

-    * \param type user specified.

-    * \param pixels user specified.

-    * \param packing indicates the image packing of pixels.

+    * Called by glTexImage1D().  Simply copy the source texture data into the

+    * destination texture memory.  The gl_texture_image fields, etc. will be

+    * fully initialized.

+    * The parameters are the same as glTexImage1D(), plus:

+    * \param packing describes how to unpack the source data.

     * \param texObj is the target texture object.

-    * \param texImage is the target texture image.  It will have the texture \p

-    * width, \p height, \p depth, \p border and \p internalFormat information.

-    * 

-    * \p retainInternalCopy is returned by this function and indicates whether

-    * core Mesa should keep an internal copy of the texture image.

-    *

-    * Drivers should call a fallback routine from texstore.c if needed.

+    * \param texImage is the target texture image.

     */

    void (*TexImage1D)( struct gl_context *ctx, GLenum target, GLint level,

                        GLint internalFormat,

@@ -250,25 +241,9 @@ struct dd_function_table {
                        struct gl_texture_image *texImage );

 

    /**

-    * Called by glTexSubImage1D().

-    *

-    * \param target user specified.

-    * \param level user specified.

-    * \param xoffset user specified.

-    * \param yoffset user specified.

-    * \param zoffset user specified.

-    * \param width user specified.

-    * \param height user specified.

-    * \param depth user specified.

-    * \param format user specified.

-    * \param type user specified.

-    * \param pixels user specified.

-    * \param packing indicates the image packing of pixels.

-    * \param texObj is the target texture object.

-    * \param texImage is the target texture image.  It will have the texture \p

-    * width, \p height, \p border and \p internalFormat information.

-    *

-    * The driver should use a fallback routine from texstore.c if needed.

+    * Called by glTexSubImage1D().  Replace a subset of the target texture

+    * with new texel data.

+    * \sa dd_function_table::TexImage1D.

     */

    void (*TexSubImage1D)( struct gl_context *ctx, GLenum target, GLint level,

                           GLint xoffset, GLsizei width,

@@ -315,24 +290,6 @@ struct dd_function_table {
                         struct gl_texture_image *texImage );

 

    /**

-    * Called by glCopyTexImage1D().

-    * 

-    * Drivers should use a fallback routine from texstore.c if needed.

-    */

-   void (*CopyTexImage1D)( struct gl_context *ctx, GLenum target, GLint level,

-                           GLenum internalFormat, GLint x, GLint y,

-                           GLsizei width, GLint border );

-

-   /**

-    * Called by glCopyTexImage2D().

-    * 

-    * Drivers should use a fallback routine from texstore.c if needed.

-    */

-   void (*CopyTexImage2D)( struct gl_context *ctx, GLenum target, GLint level,

-                           GLenum internalFormat, GLint x, GLint y,

-                           GLsizei width, GLsizei height, GLint border );

-

-   /**

     * Called by glCopyTexSubImage1D().

     * 

     * Drivers should use a fallback routine from texstore.c if needed.

diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c
index 7bb5f03f1..7c31d2577 100644
--- a/mesalib/src/mesa/main/fbobject.c
+++ b/mesalib/src/mesa/main/fbobject.c
@@ -2134,10 +2134,14 @@ _mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
 {

    const struct gl_renderbuffer_attachment *att;

    struct gl_framebuffer *buffer;

+   GLenum err;

    GET_CURRENT_CONTEXT(ctx);

 

    ASSERT_OUTSIDE_BEGIN_END(ctx);

 

+   /* The error differs in GL andd GLES. */

+   err = ctx->API == API_OPENGL ? GL_INVALID_OPERATION : GL_INVALID_ENUM;

+

    buffer = get_framebuffer_target(ctx, target);

    if (!buffer) {

       _mesa_error(ctx, GL_INVALID_ENUM,

@@ -2188,7 +2192,12 @@ _mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
       }

       else {

          assert(att->Type == GL_NONE);

-         *params = 0;

+         if (ctx->API == API_OPENGL) {

+            *params = 0;

+         } else {

+            _mesa_error(ctx, GL_INVALID_ENUM,

+                        "glGetFramebufferAttachmentParameterivEXT(pname)");

+         }

       }

       return;

    case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT:

@@ -2196,7 +2205,7 @@ _mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
 	 *params = att->TextureLevel;

       }

       else if (att->Type == GL_NONE) {

-         _mesa_error(ctx, GL_INVALID_OPERATION,

+         _mesa_error(ctx, err,

                      "glGetFramebufferAttachmentParameterivEXT(pname)");

       }

       else {

@@ -2214,7 +2223,7 @@ _mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
          }

       }

       else if (att->Type == GL_NONE) {

-         _mesa_error(ctx, GL_INVALID_OPERATION,

+         _mesa_error(ctx, err,

                      "glGetFramebufferAttachmentParameterivEXT(pname)");

       }

       else {

@@ -2232,7 +2241,7 @@ _mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
          }

       }

       else if (att->Type == GL_NONE) {

-         _mesa_error(ctx, GL_INVALID_OPERATION,

+         _mesa_error(ctx, err,

                      "glGetFramebufferAttachmentParameterivEXT(pname)");

       }

       else {

@@ -2246,7 +2255,7 @@ _mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
                      "glGetFramebufferAttachmentParameterivEXT(pname)");

       }

       else if (att->Type == GL_NONE) {

-         _mesa_error(ctx, GL_INVALID_OPERATION,

+         _mesa_error(ctx, err,

                      "glGetFramebufferAttachmentParameterivEXT(pname)");

       }

       else {

@@ -2267,7 +2276,7 @@ _mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
          return;

       }

       else if (att->Type == GL_NONE) {

-         _mesa_error(ctx, GL_INVALID_OPERATION,

+         _mesa_error(ctx, err,

                      "glGetFramebufferAttachmentParameterivEXT(pname)");

       }

       else {

@@ -2301,7 +2310,7 @@ _mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
                      "glGetFramebufferAttachmentParameterivEXT(pname)");

       }

       else if (att->Type == GL_NONE) {

-         _mesa_error(ctx, GL_INVALID_OPERATION,

+         _mesa_error(ctx, err,

                      "glGetFramebufferAttachmentParameterivEXT(pname)");

       }

       else if (att->Texture) {

diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c
index 7493cd65b..7141efba1 100644
--- a/mesalib/src/mesa/main/teximage.c
+++ b/mesalib/src/mesa/main/teximage.c
@@ -2797,29 +2797,43 @@ copyteximage(struct gl_context *ctx, GLuint dims,
 	 _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyTexImage%uD", dims);

       }

       else {

-         gl_format texFormat;

-

-         if (texImage->Data) {

-            ctx->Driver.FreeTexImageData( ctx, texImage );

-         }

+         /* choose actual hw format */

+         gl_format texFormat = _mesa_choose_texture_format(ctx, texObj,

+                                                           target, level,

+                                                           internalFormat,

+                                                           GL_NONE, GL_NONE);

 

-         ASSERT(texImage->Data == NULL);

+         if (legal_texture_size(ctx, texFormat, width, height, 1)) {

+            GLint srcX = x, srcY = y, dstX = 0, dstY = 0;

 

-         texFormat = _mesa_choose_texture_format(ctx, texObj, target, level,

-                                                 internalFormat, GL_NONE,

-                                                 GL_NONE);

+            /* Free old texture image */

+            ctx->Driver.FreeTexImageData(ctx, texImage);

 

-         if (legal_texture_size(ctx, texFormat, width, height, 1)) {

             _mesa_init_teximage_fields(ctx, target, texImage, width, height, 1,

                                        border, internalFormat, texFormat);

 

-            ASSERT(ctx->Driver.CopyTexImage2D);

-            if (dims == 1)

-               ctx->Driver.CopyTexImage1D(ctx, target, level, internalFormat,

-                                          x, y, width, border);

-            else

-               ctx->Driver.CopyTexImage2D(ctx, target, level, internalFormat,

-                                          x, y, width, height, border);

+            /* Allocate texture memory (no pixel data yet) */

+            if (dims == 1) {

+               ctx->Driver.TexImage1D(ctx, target, level, internalFormat,

+                                      width, border, GL_NONE, GL_NONE, NULL,

+                                      &ctx->Unpack, texObj, texImage);

+            }

+            else {

+               ctx->Driver.TexImage2D(ctx, target, level, internalFormat,

+                                      width, height, border, GL_NONE, GL_NONE,

+                                      NULL, &ctx->Unpack, texObj, texImage);

+            }

+

+            if (_mesa_clip_copytexsubimage(ctx, &dstX, &dstY, &srcX, &srcY,

+                                           &width, &height)) {

+               if (dims == 1)

+                  ctx->Driver.CopyTexSubImage1D(ctx, target, level, dstX,

+                                                srcX, srcY, width);

+                                                

+               else

+                  ctx->Driver.CopyTexSubImage2D(ctx, target, level, dstX, dstY,

+                                                srcX, srcY, width, height);

+            }

 

             check_gen_mipmap(ctx, target, texObj, level);

 

@@ -2830,6 +2844,7 @@ copyteximage(struct gl_context *ctx, GLuint dims,
             ctx->NewState |= _NEW_TEXTURE;

          }

          else {

+            /* probably too large of image */

             _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyTexImage%uD", dims);

          }

       }

diff --git a/mesalib/src/mesa/main/texstore.c b/mesalib/src/mesa/main/texstore.c
index 6e1e63bdf..c4aeaa8f1 100644
--- a/mesalib/src/mesa/main/texstore.c
+++ b/mesalib/src/mesa/main/texstore.c
@@ -4577,8 +4577,7 @@ texture_row_stride(const struct gl_texture_image *texImage)
 
 
 /**
- * This is the software fallback for Driver.TexImage1D()
- * and Driver.CopyTexImage1D().
+ * This is the software fallback for Driver.TexImage1D().
  * \sa _mesa_store_teximage2d()
  */
 void
@@ -4629,8 +4628,7 @@ _mesa_store_teximage1d(struct gl_context *ctx, GLenum target, GLint level,
 
 
 /**
- * This is the software fallback for Driver.TexImage2D()
- * and Driver.CopyTexImage2D().
+ * This is the software fallback for Driver.TexImage2D().
  *
  * This function is oriented toward storing images in main memory, rather
  * than VRAM.  Device driver's can easily plug in their own replacement.
@@ -4684,8 +4682,7 @@ _mesa_store_teximage2d(struct gl_context *ctx, GLenum target, GLint level,
 
 
 /**
- * This is the software fallback for Driver.TexImage3D()
- * and Driver.CopyTexImage3D().
+ * This is the software fallback for Driver.TexImage3D().
  * \sa _mesa_store_teximage2d()
  */
 void
diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.c b/mesalib/src/mesa/state_tracker/st_cb_texture.c
index 1b75f699d..7f6ffee5e 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_texture.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c
@@ -1466,34 +1466,6 @@ st_copy_texsubimage(struct gl_context *ctx,
       depth/stencil samples per pixel? Need some transfer clarifications. */

    assert(sample_count < 2);

 

-   if (srcX < 0) {

-      width -= -srcX;

-      destX += -srcX;

-      srcX = 0;

-   }

-

-   if (srcY < 0) {

-      height -= -srcY;

-      destY += -srcY;

-      srcY = 0;

-   }

-

-   if (destX < 0) {

-      width -= -destX;

-      srcX += -destX;

-      destX = 0;

-   }

-

-   if (destY < 0) {

-      height -= -destY;

-      srcY += -destY;

-      destY = 0;

-   }

-

-   if (width < 0 || height < 0)

-      return;

-

-

    assert(strb);

    assert(strb->surface);

    assert(stImage->pt);

@@ -1610,59 +1582,6 @@ st_copy_texsubimage(struct gl_context *ctx,
 

 

 static void

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

-                  GLenum internalFormat,

-                  GLint x, GLint y, GLsizei width, GLint border)

-{

-   struct gl_texture_unit *texUnit =

-      &ctx->Texture.Unit[ctx->Texture.CurrentUnit];

-   struct gl_texture_object *texObj =

-      _mesa_select_tex_object(ctx, texUnit, target);

-   struct gl_texture_image *texImage =

-      _mesa_select_tex_image(ctx, texObj, target, level);

-

-   /* Setup or redefine the texture object, texture and texture

-    * image.  Don't populate yet.  

-    */

-   ctx->Driver.TexImage1D(ctx, target, level, internalFormat,

-                          width, border,

-                          GL_RGBA, CHAN_TYPE, NULL,

-                          &ctx->DefaultPacking, texObj, texImage);

-

-   st_copy_texsubimage(ctx, target, level,

-                       0, 0, 0,  /* destX,Y,Z */

-                       x, y, width, 1);  /* src X, Y, size */

-}

-

-

-static void

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

-                  GLenum internalFormat,

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

-                  GLint border)

-{

-   struct gl_texture_unit *texUnit =

-      &ctx->Texture.Unit[ctx->Texture.CurrentUnit];

-   struct gl_texture_object *texObj =

-      _mesa_select_tex_object(ctx, texUnit, target);

-   struct gl_texture_image *texImage =

-      _mesa_select_tex_image(ctx, texObj, target, level);

-

-   /* Setup or redefine the texture object, texture and texture

-    * image.  Don't populate yet.  

-    */

-   ctx->Driver.TexImage2D(ctx, target, level, internalFormat,

-                          width, height, border,

-                          GL_RGBA, CHAN_TYPE, NULL,

-                          &ctx->DefaultPacking, texObj, texImage);

-

-   st_copy_texsubimage(ctx, target, level,

-                       0, 0, 0,  /* destX,Y,Z */

-                       x, y, width, height);  /* src X, Y, size */

-}

-

-

-static void

 st_CopyTexSubImage1D(struct gl_context * ctx, GLenum target, GLint level,

                      GLint xoffset, GLint x, GLint y, GLsizei width)

 {

@@ -1947,8 +1866,6 @@ st_init_texture_functions(struct dd_function_table *functions)
    functions->CompressedTexSubImage1D = st_CompressedTexSubImage1D;

    functions->CompressedTexSubImage2D = st_CompressedTexSubImage2D;

    functions->CompressedTexSubImage3D = st_CompressedTexSubImage3D;

-   functions->CopyTexImage1D = st_CopyTexImage1D;

-   functions->CopyTexImage2D = st_CopyTexImage2D;

    functions->CopyTexSubImage1D = st_CopyTexSubImage1D;

    functions->CopyTexSubImage2D = st_CopyTexSubImage2D;

    functions->CopyTexSubImage3D = st_CopyTexSubImage3D;

diff --git a/mesalib/src/mesa/state_tracker/st_manager.c b/mesalib/src/mesa/state_tracker/st_manager.c
index 7bd82aae2..d5228d387 100644
--- a/mesalib/src/mesa/state_tracker/st_manager.c
+++ b/mesalib/src/mesa/state_tracker/st_manager.c
@@ -587,7 +587,7 @@ st_context_teximage(struct st_context_iface *stctxi,
          internalFormat = GL_RGB;
 
       texFormat = st_ChooseTextureFormat(ctx, internalFormat,
-                                         GL_RGBA, GL_UNSIGNED_BYTE);
+                                         GL_BGRA, GL_UNSIGNED_BYTE);
 
       _mesa_init_teximage_fields(ctx, target, texImage,
                                  tex->width0, tex->height0, 1, 0,