svn merge ^/branches/released .

1 files changed, 7 insertions, 2 deletions

diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.c b/mesalib/src/mesa/state_tracker/st_cb_texture.c
index 0dc61bba9..74f9449b7 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_texture.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c
@@ -1686,7 +1686,7 @@ copy_image_data_to_texture(struct st_context *st,
    /* debug checks */

    {

       const struct gl_texture_image *dstImage =

-         stObj->base.Image[stImage->face][stImage->level];

+         stObj->base.Image[stImage->face][dstLevel];

       assert(dstImage);

       assert(dstImage->Width == stImage->base.Width);

       assert(dstImage->Height == stImage->base.Height);

@@ -1843,7 +1843,12 @@ st_finalize_texture(struct gl_context *ctx,
          /* Need to import images in main memory or held in other textures.

           */

          if (stImage && stObj->pt != stImage->pt) {

-            copy_image_data_to_texture(st, stObj, level, stImage);

+            if (level == 0 || (stImage->base.Width == u_minify(stObj->width0, level) &&

+                stImage->base.Height == u_minify(stObj->height0, level) &&

+                stImage->base.Depth == u_minify(stObj->depth0, level))) {

+               /* src image fits expected dest mipmap level size */

+               copy_image_data_to_texture(st, stObj, level, stImage);

+            }

          }

       }

    }