On Tue, Feb 27, 2018 at 02:40:46PM +0200, Pohjolainen, Topi wrote:
> On Thu, Feb 22, 2018 at 11:06:46PM -0800, Jason Ekstrand wrote:
> > ---
> > src/intel/isl/isl.c | 7 +++++--
> > src/intel/isl/isl.h | 7 +++++++
> > 2 files changed, 12 insertions(+), 2 deletions(-)
> >
> > diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
> > index 46aff46..95c1271 100644
> > --- a/src/intel/isl/isl.c
> > +++ b/src/intel/isl/isl.c
> > @@ -154,9 +154,11 @@ isl_device_get_sample_counts(struct isl_device *dev)
> > /**
> > * @param[out] info is written only on success
> > */
> > -static void
> > +void
> > isl_tiling_get_info(enum isl_tiling tiling,
> > + enum isl_surf_dim dim,
> > uint32_t format_bpb,
> > + uint32_t samples,
>
> Callers are changed to provide the extra arguments in next patch. Perhaps
> easiest to just merge these two.
With that fixed either in this patch or by merging, 6 and 7 are also:
Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com>
>
> > struct isl_tile_info *tile_info)
> > {
> > const uint32_t bs = format_bpb / 8;
> > @@ -1585,7 +1587,8 @@ isl_surf_get_tile_info(const struct isl_surf *surf,
> > struct isl_tile_info *tile_info)
> > {
> > const struct isl_format_layout *fmtl =
> > isl_format_get_layout(surf->format);
> > - isl_tiling_get_info(surf->tiling, fmtl->bpb, tile_info);
> > + isl_tiling_get_info(surf->tiling, surf->dim, fmtl->bpb,
> > + surf->samples, tile_info);
> > }
> >
> > bool
> > diff --git a/src/intel/isl/isl.h b/src/intel/isl/isl.h
> > index cdc76fe..aa5bfed 100644
> > --- a/src/intel/isl/isl.h
> > +++ b/src/intel/isl/isl.h
> > @@ -1572,6 +1572,13 @@ isl_tiling_is_std_y(enum isl_tiling tiling)
> > return (1u << tiling) & ISL_TILING_STD_Y_MASK;
> > }
> >
> > +void
> > +isl_tiling_get_info(enum isl_tiling tiling,
> > + enum isl_surf_dim dim,
> > + uint32_t format_bpb,
> > + uint32_t samples,
> > + struct isl_tile_info *tile_info);
> > +
> > uint32_t
> > isl_tiling_to_i915_tiling(enum isl_tiling tiling);
> >
> > --
> > 2.5.0.400.gff86faf
> >
> > _______________________________________________
> > 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
