summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenri Verbeet <[email protected]>2008-08-18 09:30:52 -0600
committerBrian Paul <[email protected]>2008-08-18 09:30:52 -0600
commite438827dec5a3aafa04e13caf5988f359c004249 (patch)
treed6f51f0f42c551ca1a2da18d0bfc84531b0c9dd9
parent6a00625fbb7e42a71daa87f982eee8e9077a0679 (diff)
fix byte vs. pixel offset bug for 3D textures (see bug 17170)
-rw-r--r--src/mesa/drivers/dri/intel/intel_mipmap_tree.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
index 1b645c72621..9be7e02eff1 100644
--- 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);
}