<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Fri, Sep 23, 2016 at 9:52 AM, Nanley Chery <<a href="mailto:nanleychery@gmail.com" target="_blank">nanleychery@gmail.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Fri, Sep 23, 2016 at 12:17:19AM -0700, Jason Ekstrand wrote: > Compressed 1-D textures are not well-defined thing in either GL or Vulkan. > However, auxiliary surfaces are treated as compressed textures in ISL and > we can do HiZ and CCS with 1-D so we need to be able to create them. In > order to prevent actually using them (the docs say no), we assert in the > state setup code. > Thanks for updating this commit message! <div><div class="h5"> > Signed-off-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> > --- > src/intel/isl/isl.c | 12 +++++++----- > src/intel/isl/isl_surface_state.c | 9 +++++++++ > 2 files changed, 16 insertions(+), 5 deletions(-) > > diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c > index a75fddf..710c990 100644 > --- a/src/intel/isl/isl.c > +++ b/src/intel/isl/isl.c > @@ -518,7 +518,6 @@ isl_calc_phys_level0_extent_sa(const struct isl_device *dev, > assert(info->height == 1); > assert(info->depth == 1); > assert(info->samples == 1); > - assert(!isl_format_is_compressed(info->format)); > > switch (dim_layout) { > case ISL_DIM_LAYOUT_GEN4_3D: > @@ -527,8 +526,8 @@ isl_calc_phys_level0_extent_sa(const struct isl_device *dev, > case ISL_DIM_LAYOUT_GEN9_1D: > case ISL_DIM_LAYOUT_GEN4_2D: > *phys_level0_sa = (struct isl_extent4d) { > - .w = info->width, > - .h = 1, > + .w = isl_align_npot(info->width, fmtl->bw), > + .h = fmtl->bh, > .d = 1, > .a = info->array_len, > }; > @@ -757,7 +756,7 @@ isl_calc_phys_slice0_extent_sa_gen9_1d( > { > MAYBE_UNUSED const struct isl_format_layout *fmtl = isl_format_get_layout(info->format); > > - assert(phys_level0_sa->height == 1); > + assert(phys_level0_sa->height == fmtl->bh); > assert(phys_level0_sa->depth == 1); > assert(info->samples == 1); > assert(image_align_sa->w >= fmtl->bw); > @@ -1567,9 +1566,12 @@ get_image_offset_sa_gen9_1d(const struct isl_surf *surf, > uint32_t *x_offset_sa, > uint32_t *y_offset_sa) > { > + MAYBE_UNUSED const struct isl_format_layout *fmtl = > + isl_format_get_layout(surf->format); > + > assert(level < surf->levels); > assert(layer < surf->phys_level0_sa.array_len); > - assert(surf->phys_level0_sa.height == 1); > + assert(surf->phys_level0_sa.height == fmtl->bh); > assert(surf->phys_level0_sa.depth == 1); > assert(surf->samples == 1); > </div></div>As mentioned in my previous reply, I no longer think we should update get_image_offset_sa_gen9_1d() and isl_calc_phys_slice0_extent_sa_gen9_1d() as auxiliary surfaces won't have this layout. </blockquote><div> </div><div>Right... I didn't match your original comment with why until I thought about it a bit more. I dropped those hunks. </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> > diff --git a/src/intel/isl/isl_surface_state.c b/src/intel/isl/isl_surface_state.c > index 979e140..210308c 100644 > --- a/src/intel/isl/isl_surface_state.c > +++ b/src/intel/isl/isl_surface_state.c > @@ -215,6 +215,15 @@ isl_genX(surf_fill_state_s)(const struct isl_device *dev, void *state, > assert(isl_format_supports_rendering(dev->info, info->view->format)); > else if (info->view->usage & ISL_SURF_USAGE_TEXTURE_BIT) > assert(isl_format_supports_sampling(dev->info, info->view->format)); > + > + /* From the Sky Lake PRM Vol. 2d, RENDER_SURFACE_STATE::SurfaceFormat > + * > + * This field cannot be a compressed (BC*, DXT*, FXT*, ETC*, EAC*) > + * format if the Surface Type is SURFTYPE_1D > + */ > + if (info->surf->dim == ISL_SURF_DIM_1D) > + assert(!isl_format_is_compressed(info->view->format)); > + Thanks for adding this assertion! Placing it in get_surftype() may be a better fit as it already has assertions against 1D images used as cube maps. > s.SurfaceFormat = info->view->format; > > #if GEN_IS_HASWELL > -- > 2.5.0.400.gff86faf > > _______________________________________________ > mesa-dev mailing list > <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> > <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div> </div></div>