[Mesa-dev] [PATCH V3 15/30] i965: Adjust surface_state emission to account for view parameters

[Kenneth Graunke]

On 04/02/2014 01:05 AM, Chris Forbes wrote:
> Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
> Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
> ---
>  src/mesa/drivers/dri/i965/gen7_wm_surface_state.c | 18 +++++++++++++-----
>  1 file changed, 13 insertions(+), 5 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 b9d6c8b..b6f2cff 100644
> --- a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
> +++ b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
> @@ -288,7 +288,7 @@ gen7_update_texture_surface(struct gl_context *ctx,
>     memset(surf, 0, 8 * 4);
>  
>     uint32_t tex_format = translate_tex_format(brw,
> -                                              mt->format,
> +                                              intelObj->_Format,
>                                                sampler->sRGBDecode);
>  
>     if (for_gather && tex_format == BRW_SURFACEFORMAT_R32G32_FLOAT)
> @@ -310,6 +310,11 @@ gen7_update_texture_surface(struct gl_context *ctx,
>     if (mt->logical_depth0 > 1 && tObj->Target != GL_TEXTURE_3D)
>        surf[0] |= GEN7_SURFACE_IS_ARRAY;
>  
> +   /* if this is a view with restricted NumLayers, then
> +    * our effective depth is not just the miptree depth. */

Please put the closing */ on its own line (here and in other patches).

> +   uint32_t effective_depth = (tObj->Immutable && tObj->Target != GL_TEXTURE_3D)
> +                              ? tObj->NumLayers : mt->logical_depth0;
> +
>     if (mt->array_spacing_lod0)
>        surf[0] |= GEN7_SURFACE_ARYSPC_LOD0;
>  
> @@ -317,14 +322,17 @@ gen7_update_texture_surface(struct gl_context *ctx,
>  
>     surf[2] = SET_FIELD(mt->logical_width0 - 1, GEN7_SURFACE_WIDTH) |
>               SET_FIELD(mt->logical_height0 - 1, GEN7_SURFACE_HEIGHT);
> -   surf[3] = SET_FIELD(mt->logical_depth0 - 1, BRW_SURFACE_DEPTH) |
> +
> +   surf[3] = SET_FIELD(effective_depth - 1, BRW_SURFACE_DEPTH) |
>               (mt->region->pitch - 1);
>  
> -   surf[4] = gen7_surface_msaa_bits(mt->num_samples, mt->msaa_layout);
> +   surf[4] = gen7_surface_msaa_bits(mt->num_samples, mt->msaa_layout) |
> +             SET_FIELD(tObj->MinLayer, GEN7_SURFACE_MIN_ARRAY_ELEMENT);
> +
> +   surf[4] |= (effective_depth - 1) << 7;

I'd prefer to get rid of the magic "7"...and these could be combined:

  surf[4] = gen7_surface_msaa_bits(mt->num_samples, mt->msaa_layout) |
            SET_FIELD(tObj->MinLayer, GEN7_SURFACE_MIN_ARRAY_ELEMENT) |
            SET_FIELD((effective_depth - 1),
                      GEN7_SURFACE_RENDER_TARGET_VIEW_EXTENT);

>  
>     surf[5] = (SET_FIELD(GEN7_MOCS_L3, GEN7_SURFACE_MOCS) |
> -              SET_FIELD(tObj->BaseLevel - mt->first_level,
> -                        GEN7_SURFACE_MIN_LOD) |
> +              SET_FIELD(tObj->MinLevel + tObj->BaseLevel - mt->first_level, GEN7_SURFACE_MIN_LOD) |
>                /* mip count */
>                (intelObj->_MaxLevel - tObj->BaseLevel));
>  
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20140408/e3fbe153/attachment.sig>