[Mesa-dev] [PATCH 10/13] i965/miptree: Add and use mt_surf_usage

[Pohjolainen, Topi]

On Wed, Jun 13, 2018 at 09:25:37AM -0700, Nanley Chery wrote:
> On Wed, Jun 13, 2018 at 09:39:08AM +0300, Pohjolainen, Topi wrote:
> > On Tue, Jun 12, 2018 at 12:22:02PM -0700, Nanley Chery wrote:
> > > ---
> > >  src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 40 ++++++++++++-------
> > >  1 file changed, 26 insertions(+), 14 deletions(-)
> > > 
> > > diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> > > index cfb83d15ecc..5e00da86d32 100644
> > > --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> > > +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> > > @@ -677,6 +677,23 @@ make_separate_stencil_surface(struct brw_context *brw,
> > >     return true;
> > >  }
> > >  
> > > +/* Return the usual surface usage flags for the given format. */
> > > +static isl_surf_usage_flags_t
> > > +mt_surf_usage(mesa_format format)
> > > +{
> > > +   switch(_mesa_get_format_base_format(format)) {
> > > +   case GL_DEPTH_COMPONENT:
> > > +      return ISL_SURF_USAGE_DEPTH_BIT | ISL_SURF_USAGE_TEXTURE_BIT;
> > > +   case GL_DEPTH_STENCIL:
> > > +      return ISL_SURF_USAGE_DEPTH_BIT | ISL_SURF_USAGE_STENCIL_BIT |
> > > +             ISL_SURF_USAGE_TEXTURE_BIT;
> > > +   case GL_STENCIL_INDEX:
> > > +      return ISL_SURF_USAGE_STENCIL_BIT | ISL_SURF_USAGE_TEXTURE_BIT;
> > > +   default:
> > > +      return ISL_SURF_USAGE_RENDER_TARGET_BIT | ISL_SURF_USAGE_TEXTURE_BIT;
> > > +   }
> > > +}
> > > +
> > >  static struct intel_mipmap_tree *
> > >  miptree_create(struct brw_context *brw,
> > >                 GLenum target,
> > > @@ -713,8 +730,7 @@ miptree_create(struct brw_context *brw,
> > >        return make_surface(brw, target, mt_fmt, first_level, last_level,
> > >                            width0, height0, depth0, num_samples,
> > >                            tiling_flags,
> > > -                          ISL_SURF_USAGE_STENCIL_BIT |
> > > -                          ISL_SURF_USAGE_TEXTURE_BIT,
> > 
> > New logic also sets ISL_SURF_USAGE_DEPTH_BIT here.
> > 
> 
> How so? The base format of MESA_FORMAT_S_UINT8 is GL_STENCIL_INDEX.

Yeah, my bad, I misread completely, same further down, sorry for the noise :(

> 
> > > +                          mt_surf_usage(mt_fmt),
> > >                            alloc_flags,
> > >                            0,
> > >                            NULL);
> > > @@ -726,7 +742,7 @@ miptree_create(struct brw_context *brw,
> > >           brw, target, mt_fmt,
> > >           first_level, last_level,
> > >           width0, height0, depth0, num_samples, tiling_flags,
> > > -         ISL_SURF_USAGE_DEPTH_BIT | ISL_SURF_USAGE_TEXTURE_BIT,
> > > +         mt_surf_usage(mt_fmt),
> > >           alloc_flags, 0, NULL);
> > >  
> > >        if (needs_separate_stencil(brw, mt, format) &&
> > > @@ -746,8 +762,7 @@ miptree_create(struct brw_context *brw,
> > >                                       first_level, last_level,
> > >                                       width0, height0, depth0,
> > >                                       num_samples, tiling_flags,
> > > -                                     ISL_SURF_USAGE_RENDER_TARGET_BIT |
> > > -                                     ISL_SURF_USAGE_TEXTURE_BIT,
> > > +                                     mt_surf_usage(mt_fmt),
> > >                                       alloc_flags, 0, NULL);
> > >     if (!mt)
> > >        return NULL;
> > > @@ -816,12 +831,11 @@ intel_miptree_create_for_bo(struct brw_context *brw,
> > >  
> > >     if ((base_format == GL_DEPTH_COMPONENT ||
> > >          base_format == GL_DEPTH_STENCIL)) {
> > > -      const mesa_format depth_only_format =
> > > -         intel_depth_format_for_depthstencil_format(format);
> > > -      mt = make_surface(brw, target,
> > > -                        devinfo->gen >= 6 ? depth_only_format : format,
> > > +      mesa_format mt_fmt = (devinfo->gen < 6) ? format :
> > > +                           intel_depth_format_for_depthstencil_format(format);
> > > +      mt = make_surface(brw, target, mt_fmt,
> > >                          0, 0, width, height, depth, 1, ISL_TILING_Y0_BIT,
> > > -                        ISL_SURF_USAGE_DEPTH_BIT | ISL_SURF_USAGE_TEXTURE_BIT,
> > > +                        mt_surf_usage(mt_fmt),
> > >                          0, pitch, bo);
> > >        if (!mt)
> > >           return NULL;
> > > @@ -836,8 +850,7 @@ intel_miptree_create_for_bo(struct brw_context *brw,
> > >        mt = make_surface(brw, target, MESA_FORMAT_S_UINT8,
> > >                          0, 0, width, height, depth, 1,
> > >                          ISL_TILING_W_BIT,
> > > -                        ISL_SURF_USAGE_STENCIL_BIT |
> > > -                        ISL_SURF_USAGE_TEXTURE_BIT,
> > > +                        mt_surf_usage(MESA_FORMAT_S_UINT8),
> > 
> > Same here, new logic also sets ISL_SURF_USAGE_DEPTH_BIT here.
> > 
> 
> How so?
> 
> -Nanley
> 
> > >                          0, pitch, bo);
> > >        if (!mt)
> > >           return NULL;
> > > @@ -862,8 +875,7 @@ intel_miptree_create_for_bo(struct brw_context *brw,
> > >     mt = make_surface(brw, target, format,
> > >                       0, 0, width, height, depth, 1,
> > >                       1lu << tiling,
> > > -                     ISL_SURF_USAGE_RENDER_TARGET_BIT |
> > > -                     ISL_SURF_USAGE_TEXTURE_BIT,
> > > +                     mt_surf_usage(format),
> > >                       0, pitch, bo);
> > >     if (!mt)
> > >        return NULL;
> > > -- 
> > > 2.17.0
> > > 
> > > _______________________________________________
> > > mesa-dev mailing list
> > > mesa-dev at lists.freedesktop.org
> > > https://lists.freedesktop.org/mailman/listinfo/mesa-dev