From e31da4950669ef1aaa30bb5c00fac5a968aeadf1 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Sat, 16 Aug 2008 18:39:05 +0200 Subject: [PATCH] intel: intel_miptree_depth_offsets() returns byte offsets e5f50f2fa32c50807da3a8f13733f0fbc7868f94 changed the image_offset field in intel_mipmap_level from pixel offsets to byte offsets, but didn't fix calls to intel_miptree_depth_offsets(), which broke 3D texture support. --- src/mesa/drivers/dri/intel/intel_mipmap_tree.c | 6 +++--- 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 1b645c7..9be7e02 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); } -- 1.5.6.4