Attachment 30741 Details for Bug 24734 – possible fix

[patch] possible fix

i915_image_offset.diff (text/plain), 1.78 KB, created by Roland Scheidegger on 2009-10-27 06:44:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Scheidegger

Created: 2009-10-27 06:44:21 UTC

Size: 1.78 KB

patch

obsolete

>diff --git a/src/mesa/drivers/dri/i915/i830_texstate.c b/src/mesa/drivers/dri/i915/i830_texstate.c
>index 6f998fa..72a12d7 100644
>--- a/src/mesa/drivers/dri/i915/i830_texstate.c
>+++ b/src/mesa/drivers/dri/i915/i830_texstate.c
>@@ -160,11 +160,12 @@ i830_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3)
> 
>       pitch = intelObj->pitchOverride;
>    } else {
>+      GLuint x,y;
>+      intel_miptree_get_image_offset(intelObj->mt, intelObj->firstLevel,
>+				     0, 0, &x, &y);
>       dri_bo_reference(intelObj->mt->region->buffer);
>       i830->state.tex_buffer[unit] = intelObj->mt->region->buffer;
>-      i830->state.tex_offset[unit] = intel_miptree_image_offset(intelObj->mt,
>-								0, intelObj->
>-								firstLevel);
>+      i830->state.tex_offset[unit] = x + y * mt->pitch;
> 
>       format = translate_texture_format(firstImage->TexFormat->MesaFormat,
> 					firstImage->InternalFormat);
>diff --git a/src/mesa/drivers/dri/i915/i915_texstate.c b/src/mesa/drivers/dri/i915/i915_texstate.c
>index 32d4b30..428e11b 100644
>--- a/src/mesa/drivers/dri/i915/i915_texstate.c
>+++ b/src/mesa/drivers/dri/i915/i915_texstate.c
>@@ -171,11 +171,12 @@ i915_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3)
> 
>       pitch = intelObj->pitchOverride;
>    } else {
>+      GLuint x,y;
>+      intel_miptree_get_image_offset(intelObj->mt, intelObj->firstLevel,
>+				     0, 0, &x, &y);
>       dri_bo_reference(intelObj->mt->region->buffer);
>       i915->state.tex_buffer[unit] = intelObj->mt->region->buffer;
>-      i915->state.tex_offset[unit] =  intel_miptree_image_offset(intelObj->mt,
>-								 0, intelObj->
>-								 firstLevel);
>+      i915->state.tex_offset[unit] = x + y * mt->pitch;
> 
>       format = translate_texture_format(firstImage->TexFormat->MesaFormat, 
> 					firstImage->InternalFormat,

Actions: View | Splinter Review

Attachments on bug 24734: 30741 | 30849

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.