summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2009-12-18 16:49:32 -0800
committerEric Anholt <eric@anholt.net>2009-12-18 20:35:57 -0800
commitb51e0fafdf6a39df1b0d1208595c92d5fa9ceba6 (patch)
treebd59521fc38b87f8e1a046fccae3a5c5b2d0d273
parentf06c8bd8dd961c9b722759b5d1f8fca78023aba8 (diff)
downloadmesa-b51e0fafdf6a39df1b0d1208595c92d5fa9ceba6.tar.gz
i915: Clean up some unnecessary x/y miptree code.
The base of the texture is always the base of the miptree. If it wasn't, we'd have issues with this code due to miptrees not walking the same direction for all LODs.
-rw-r--r--src/mesa/drivers/dri/i915/i915_texstate.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/i915/i915_texstate.c b/src/mesa/drivers/dri/i915/i915_texstate.c
index f52ff2bcc4a..bcab043e97f 100644
--- a/src/mesa/drivers/dri/i915/i915_texstate.c
+++ b/src/mesa/drivers/dri/i915/i915_texstate.c
@@ -175,18 +175,9 @@ i915_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3)
pitch = intelObj->pitchOverride;
} else {
- GLuint dst_x, dst_y;
-
- intel_miptree_get_image_offset(intelObj->mt, intelObj->firstLevel, 0, 0,
- &dst_x, &dst_y);
-
dri_bo_reference(intelObj->mt->region->buffer);
i915->state.tex_buffer[unit] = intelObj->mt->region->buffer;
- /* XXX: This calculation is probably broken for tiled images with
- * a non-page-aligned offset.
- */
- i915->state.tex_offset[unit] = (dst_x + dst_y * intelObj->mt->pitch) *
- intelObj->mt->cpp;
+ i915->state.tex_offset[unit] = 0; /* Always the origin of the miptree */
format = translate_texture_format(firstImage->TexFormat,
firstImage->InternalFormat,