why do we sped two patches refactoring/renaming this field just so we can
delete it?
On Mon, Mar 6, 2017 at 10:12 AM, Chad Versace <chadvers...@chromium.org>
wrote:
> ---
> src/intel/isl/isl.c | 12 ++----------
> src/intel/isl/isl.h | 3 ---
> 2 files changed, 2 insertions(+), 13 deletions(-)
>
> diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
> index b3ac305b81b..ec8424cd48b 100644
> --- a/src/intel/isl/isl.c
> +++ b/src/intel/isl/isl.c
> @@ -1008,8 +1008,6 @@ isl_calc_linear_row_pitch(const struct isl_device
> *dev,
> /* Any override of row_pitch should happen earlier. */
> assert(info->row_pitch == 0);
>
> - uint32_t row_pitch = info->min_row_pitch;
> -
> /* First, align the surface to a cache line boundary, as the PRM
> explains
> * below.
> *
> @@ -1056,7 +1054,7 @@ isl_calc_linear_row_pitch(const struct isl_device
> *dev,
> */
> assert(phys_slice0_sa->w % fmtl->bw == 0);
> const uint32_t bs = fmtl->bpb / 8;
> - row_pitch = MAX(row_pitch, bs * (phys_slice0_sa->w / fmtl->bw));
> + uint32_t row_pitch = bs * (phys_slice0_sa->w / fmtl->bw);
>
> /* From the Broadwel PRM >> Volume 2d: Command Reference: Structures >>
> * RENDER_SURFACE_STATE Surface Pitch (p349):
> @@ -1103,13 +1101,7 @@ isl_calc_tiled_row_pitch(const struct isl_device
> *dev,
> isl_align_div(total_w_el * tile_el_scale,
> tile_info->logical_extent_el.width);
>
> - uint32_t row_pitch = total_w_tl * tile_info->phys_extent_B.width;
> - if (row_pitch < info->min_row_pitch) {
> - row_pitch = isl_align_npot(info->min_row_pitch,
> - tile_info->phys_extent_B.width);
> - }
> -
> - return row_pitch;
> + return total_w_tl * tile_info->phys_extent_B.width;
> }
>
> static uint32_t
> diff --git a/src/intel/isl/isl.h b/src/intel/isl/isl.h
> index 5f73639fb48..4fcd416054d 100644
> --- a/src/intel/isl/isl.h
> +++ b/src/intel/isl/isl.h
> @@ -810,9 +810,6 @@ struct isl_surf_init_info {
> /** Lower bound for isl_surf::alignment, in bytes. */
> uint32_t min_alignment;
>
> - /** Lower bound for isl_surf::row_pitch, in bytes. */
> - uint32_t min_row_pitch;
> -
> /**
> * Exact value for isl_surf::row_pitch. Ignored if zero.
> *
> --
> 2.12.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
