Mesa (mesa_7_7_branch): intel: Fix CopyTexImage from tiled mipmap levels > 0.

[Eric Anholt]

Module: Mesa
Branch: mesa_7_7_branch
Commit: 19a26dfc474618ecfe881846a8c9dac221332d44
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=19a26dfc474618ecfe881846a8c9dac221332d44

Author: Eric Anholt <eric at anholt.net>
Date:   Mon Jan  4 09:39:07 2010 -0800

intel: Fix CopyTexImage from tiled mipmap levels > 0.

Fixes piglit fbo-copyteximage.

---

 src/mesa/drivers/dri/intel/intel_tex_copy.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_tex_copy.c b/src/mesa/drivers/dri/intel/intel_tex_copy.c
index ee953cf..ef5aed3 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_copy.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_copy.c
@@ -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);