fix byte vs. pixel offset bug for 3D textures (see bug 17170)

diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
index 1b645c7262101611d8a9a2f2595a7081713fde64..9be7e02eff13433e1b21f20d4b4cda1d68eb4a71 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
@@ -442,7 +442,7 @@ intel_miptree_image_data(struct intel_context *intel,
         height = (height + 3) / 4;
       intel_region_data(intel,
                        dst->region,
-                       dst_offset + dst_depth_offset[i] * dst->cpp, /* dst_offset */
+                       dst_offset + dst_depth_offset[i], /* dst_offset */
                        0, 0,                             /* dstx, dsty */
                        src,
                        src_row_pitch,
@@ -479,10 +479,10 @@ intel_miptree_image_copy(struct intel_context *intel,
 
    for (i = 0; i < depth; i++) {
       intel_region_copy(intel,
-                        dst->region, dst_offset + dst_depth_offset[i] * dst->cpp,
+                        dst->region, dst_offset + dst_depth_offset[i],
                         0,
                         0,
-                        src->region, src_offset + src_depth_offset[i] * src->cpp,
+                        src->region, src_offset + src_depth_offset[i],
                         0, 0, width, height);
    }