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

4 files changed, 64 insertions, 86 deletions

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