[Mesa-dev] [PATCH 02/36] i965/miptree: Remove the stencil_as_y_tiled parameter from get_tile_masks

[Pohjolainen, Topi]

On Wed, Jun 29, 2016 at 05:37:21PM -0700, Jason Ekstrand wrote:
> It's only used to stomp the tiling to Y and it's only used by blorp so
> there's no reason why blorp can't do it itself.

Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

> ---
>  src/mesa/drivers/dri/i965/brw_blorp.c         | 6 ++++--
>  src/mesa/drivers/dri/i965/brw_misc_state.c    | 6 +++---
>  src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 5 +----
>  src/mesa/drivers/dri/i965/intel_mipmap_tree.h | 1 -
>  4 files changed, 8 insertions(+), 10 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c b/src/mesa/drivers/dri/i965/brw_blorp.c
> index 275f10c..f4c80bc 100644
> --- a/src/mesa/drivers/dri/i965/brw_blorp.c
> +++ b/src/mesa/drivers/dri/i965/brw_blorp.c
> @@ -122,9 +122,11 @@ brw_blorp_compute_tile_offsets(const struct brw_blorp_surface_info *info,
>                                 uint32_t *tile_x, uint32_t *tile_y)
>  {
>     uint32_t mask_x, mask_y;
> +   uint32_t tiling = info->mt->tiling;
> +   if (info->map_stencil_as_y_tiled)
> +      tiling = I915_TILING_Y;
>  
> -   intel_get_tile_masks(info->mt->tiling, info->mt->tr_mode, info->mt->cpp,
> -                        info->map_stencil_as_y_tiled,
> +   intel_get_tile_masks(tiling, info->mt->tr_mode, info->mt->cpp,
>                          &mask_x, &mask_y);
>  
>     *tile_x = info->x_offset & mask_x;
> diff --git a/src/mesa/drivers/dri/i965/brw_misc_state.c b/src/mesa/drivers/dri/i965/brw_misc_state.c
> index 690c2f6..e98accd 100644
> --- a/src/mesa/drivers/dri/i965/brw_misc_state.c
> +++ b/src/mesa/drivers/dri/i965/brw_misc_state.c
> @@ -177,7 +177,7 @@ brw_get_depthstencil_tile_masks(struct intel_mipmap_tree *depth_mt,
>  
>     if (depth_mt) {
>        intel_get_tile_masks(depth_mt->tiling, depth_mt->tr_mode,
> -                           depth_mt->cpp, false,
> +                           depth_mt->cpp,
>                             &tile_mask_x, &tile_mask_y);
>  
>        if (intel_miptree_level_has_hiz(depth_mt, depth_level)) {
> @@ -185,7 +185,7 @@ brw_get_depthstencil_tile_masks(struct intel_mipmap_tree *depth_mt,
>           intel_get_tile_masks(depth_mt->hiz_buf->mt->tiling,
>                                depth_mt->hiz_buf->mt->tr_mode,
>                                depth_mt->hiz_buf->mt->cpp,
> -                              false, &hiz_tile_mask_x,
> +                              &hiz_tile_mask_x,
>                                &hiz_tile_mask_y);
>  
>           /* Each HiZ row represents 2 rows of pixels */
> @@ -209,7 +209,7 @@ brw_get_depthstencil_tile_masks(struct intel_mipmap_tree *depth_mt,
>           intel_get_tile_masks(stencil_mt->tiling,
>                                stencil_mt->tr_mode,
>                                stencil_mt->cpp,
> -                              false, &stencil_tile_mask_x,
> +                              &stencil_tile_mask_x,
>                                &stencil_tile_mask_y);
>  
>           tile_mask_x |= stencil_tile_mask_x;
> diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> index d620119..4d23b70 100644
> --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> @@ -1241,12 +1241,9 @@ intel_get_tile_dims(uint32_t tiling, uint32_t tr_mode, uint32_t cpp,
>   */
>  void
>  intel_get_tile_masks(uint32_t tiling, uint32_t tr_mode, uint32_t cpp,
> -                     bool map_stencil_as_y_tiled,
>                       uint32_t *mask_x, uint32_t *mask_y)
>  {
>     uint32_t tile_w_bytes, tile_h;
> -   if (map_stencil_as_y_tiled)
> -      tiling = I915_TILING_Y;
>  
>     intel_get_tile_dims(tiling, tr_mode, cpp, &tile_w_bytes, &tile_h);
>  
> @@ -1316,7 +1313,7 @@ intel_miptree_get_tile_offsets(const struct intel_mipmap_tree *mt,
>     uint32_t x, y;
>     uint32_t mask_x, mask_y;
>  
> -   intel_get_tile_masks(mt->tiling, mt->tr_mode, mt->cpp, false, &mask_x, &mask_y);
> +   intel_get_tile_masks(mt->tiling, mt->tr_mode, mt->cpp, &mask_x, &mask_y);
>     intel_miptree_get_image_offset(mt, level, slice, &x, &y);
>  
>     *tile_x = x & mask_x;
> diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
> index 4388741..c28fb33 100644
> --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
> +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
> @@ -817,7 +817,6 @@ intel_get_image_dims(struct gl_texture_image *image,
>  
>  void
>  intel_get_tile_masks(uint32_t tiling, uint32_t tr_mode, uint32_t cpp,
> -                     bool map_stencil_as_y_tiled,
>                       uint32_t *mask_x, uint32_t *mask_y);
>  
>  void
> -- 
> 2.5.0.400.gff86faf
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev