[Mesa-dev] [PATCH 1/9] i965: Always look up from the object's mt when setting up texturing state.

[Chad Versace]

On 09/18/2013 12:59 PM, Eric Anholt wrote:
> We know that the object's mt is equal to the firstimage's mt because it's
> gone through intel_finalize_mipmap_tree().  Saves a lookup of firstimage
> on pre-gen7.
> ---
>   src/mesa/drivers/dri/i965/brw_wm_surface_state.c  | 4 +---
>   src/mesa/drivers/dri/i965/gen7_wm_surface_state.c | 2 +-
>   2 files changed, 2 insertions(+), 4 deletions(-)



> diff --git a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
> index 37e3174..531a1a2 100644
> --- a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
> +++ b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
> @@ -326,7 +326,7 @@ gen7_update_texture_surface(struct gl_context *ctx,
>
>      surf[5] = (SET_FIELD(GEN7_MOCS_L3, GEN7_SURFACE_MOCS) |
>                 /* mip count */
> -              (intelObj->_MaxLevel - intel_image->mt->first_level));
> +              (intelObj->_MaxLevel - mt->first_level));
>
>      if (brw->is_haswell) {
>         /* Handling GL_ALPHA as a surface format override breaks 1.30+ style
>

There is hunk in patch 6 that should be paired with this hunk. Move it and patch 1 is
Reviewed-by: Chad Versace <chad.versace at linux.intel.com>