intel: Fix CopyTexImage from tiled mipmap levels > 0.
authorEric Anholt <eric@anholt.net>
Mon, 4 Jan 2010 17:39:07 +0000 (09:39 -0800)
committerEric Anholt <eric@anholt.net>
Mon, 4 Jan 2010 22:15:12 +0000 (14:15 -0800)
Fixes piglit fbo-copyteximage.

src/mesa/drivers/dri/intel/intel_tex_copy.c

index ee953cfbe78a8c2f0c9bf2656cabb379df171b79..ef5aed32f31058d257ffbd64e8bcc0bf705a348d 100644 (file)
@@ -160,13 +160,14 @@ do_copy_texsubimage(struct intel_context *intel,
                             intelImage->mt->cpp,
                             src_pitch,
                             src->buffer,
-                            src->draw_offset,
+                            0,
                             src->tiling,
                             intelImage->mt->pitch,
                             dst_bo,
                             0,
                             intelImage->mt->region->tiling,
-                            x, y, image_x + dstx, image_y + dsty,
+                            src->draw_x + x, src->draw_y + y,
+                            image_x + dstx, image_y + dsty,
                             width, height,
                             GL_COPY)) {
         UNLOCK_HARDWARE(intel);