summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/intel/intel_tex_image.c
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-10-12 17:37:06 -0600
committerBrian Paul <brianp@vmware.com>2009-10-12 18:12:00 -0600
commite6594a22f298833eeb6881795b24d03d2fd8e898 (patch)
tree02012d0fc7c5334244309441a1d117f3a0810836 /src/mesa/drivers/dri/intel/intel_tex_image.c
parent15d2ef602461ca75e7160af46a2b5040742a91c9 (diff)
intel: pass zslice to intel_miptree_image_offset()
This lets us get rid of intel_miptree_depth_offsets() and simplify all of the calling code.
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_tex_image.c')
-rw-r--r--src/mesa/drivers/dri/intel/intel_tex_image.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c
index 5c915178e7..dcc613449f 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_image.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c
@@ -222,7 +222,8 @@ try_pbo_upload(struct intel_context *intel,
dst_offset = intel_miptree_image_offset(intelImage->mt,
intelImage->face,
- intelImage->level);
+ intelImage->level,
+ 0 /* zslice */);
dst_stride = intelImage->mt->pitch;
@@ -281,8 +282,8 @@ try_pbo_zcopy(struct intel_context *intel,
dst_offset = intel_miptree_image_offset(intelImage->mt,
intelImage->face,
- intelImage->level);
-
+ intelImage->level,
+ 0 /* zslice */);
dst_stride = intelImage->mt->pitch;
if (src_stride != dst_stride || dst_offset != 0 || src_offset != 0) {