[Mesa-dev] [PATCH 2/2] gallium/radeonsi: add 2d tiling support for texture

[Michel Dänzer]

On Mit, 2013-04-03 at 17:21 -0400, j.glisse at gmail.com wrote: 
> From: Jerome Glisse <jglisse at redhat.com>
> 
> Signed-off-by: Jerome Glisse <jglisse at redhat.com>

FWIW, we've been using just 'radeonsi:' as the commit log summary
prefix.


> diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
> index ca9e8b4..9483304 100644
> --- a/src/gallium/drivers/radeonsi/si_state.c
> +++ b/src/gallium/drivers/radeonsi/si_state.c
> [...]
> @@ -1707,6 +1656,7 @@ static void si_cb(struct r600_context *rctx, struct si_pm4_state *pm4,
>                 S_028C74_FORCE_DST_ALPHA_1(desc->swizzle[3] == UTIL_FORMAT_SWIZZLE_1);
>  
>         offset += r600_resource_va(rctx->context.screen, state->cbufs[cb]->texture);
> +       offset += rtex->surface.level[0].offset;
>         offset >>= 8;
>  
>         /* FIXME handle enabling of CB beyond BASE8 which has different offset */

This looks wrong. offset already includes
rtex->surface.level[level].offset at this point.


> @@ -2239,7 +2183,6 @@ static struct pipe_sampler_view *si_create_sampler_view(struct pipe_context *ctx
>                           S_008F24_LAST_ARRAY(state->u.tex.last_layer));
>         view->state[6] = 0;
>         view->state[7] = 0;
> -
>         return &view->base;
>  }
>  

Please drop the whitespace-only hunks. 

-- 
Earthling Michel Dänzer           |                   http://www.amd.com
Libre software enthusiast         |          Debian, X and DRI developer