[Mesa-dev] [PATCH 10/16] i965: Add function to copy a stencil miptree to an R8_UINT miptree

[Pohjolainen, Topi]

On Wed, Aug 24, 2016 at 04:55:02PM -0700, Jordan Justen wrote:
> Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
> ---
>  src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 55 ++++++++++++++++++++++++++-
>  src/mesa/drivers/dri/i965/intel_mipmap_tree.h |  4 ++
>  2 files changed, 58 insertions(+), 1 deletion(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> index dd6280b..3f23588 100644
> --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> @@ -674,7 +674,6 @@ miptree_create(struct brw_context *brw,
>  
>     etc_format = (format != tex_format) ? tex_format : MESA_FORMAT_NONE;
>  
> -   assert((layout_flags & MIPTREE_LAYOUT_DISABLE_AUX) == 0);

I was hoping to keep this somehow but in the end couldn't figure out any
additional constraints to check (format, etc). So we just need to let it go.

>     assert((layout_flags & MIPTREE_LAYOUT_FOR_BO) == 0);
>     mt = intel_miptree_create_layout(brw, target, format,
>                                      first_level, last_level, width0,
> @@ -2282,6 +2281,60 @@ intel_miptree_updownsample(struct brw_context *brw,
>     }
>  }
>  
> +void
> +intel_update_r8stencil(struct brw_context *brw,
> +                       struct intel_mipmap_tree *mt)
> +{
> +   assert(brw->gen >= 7);
> +   struct intel_mipmap_tree *src =
> +      mt->format == MESA_FORMAT_S_UINT8 ? mt : mt->stencil_mt;
> +   if (!src || brw->gen >= 8 || !src->r8stencil_needs_update)
> +      return;
> +
> +   if(!mt->r8stencil_mt) {

Space missing.

> +      uint32_t r8stencil_flags =

Could be const.

> +         MIPTREE_LAYOUT_ACCELERATED_UPLOAD | MIPTREE_LAYOUT_TILING_Y |
> +         MIPTREE_LAYOUT_DISABLE_AUX;
> +      assert(brw->gen > 6); /* Handle MIPTREE_LAYOUT_FORCE_ALL_SLICE_AT_LOD */
> +      mt->r8stencil_mt = intel_miptree_create(brw,
> +                                                src->target,
> +                                                MESA_FORMAT_R_UINT8,
> +                                                src->first_level,
> +                                                src->last_level,
> +                                                src->logical_width0,
> +                                                src->logical_height0,
> +                                                src->logical_depth0,
> +                                                src->num_samples,
> +                                                r8stencil_flags);
> +      assert(mt->r8stencil_mt);
> +   }
> +
> +   struct intel_mipmap_tree *dst = mt->r8stencil_mt;
> +
> +   for (int level = src->first_level; level <= src->last_level; level++) {
> +      struct intel_mipmap_level *mlevel = &src->level[level];

Could be const or you could just drop this and have further down:

         for (int layer = 0; layer < src->level[level].depth; layer++) {

> +      int layers_per_blit =
> +         (dst->msaa_layout == INTEL_MSAA_LAYOUT_UMS ||
> +          dst->msaa_layout == INTEL_MSAA_LAYOUT_CMS) ?
> +         dst->num_samples : 1;
> +      for (int layer = 0; layer < mlevel->depth; layer++) {
> +         brw_blorp_blit_miptrees(brw,
> +                                 src, level, layer,
> +                                 src->format, SWIZZLE_X,
> +                                 dst, level, layers_per_blit * layer,
> +                                 MESA_FORMAT_R_UNORM8,
> +                                 0, 0,
> +                                 src->logical_width0, src->logical_height0,
> +                                 0, 0,
> +                                 dst->logical_width0, dst->logical_height0,
> +                                 GL_NEAREST, false, false /*mirror x, y*/,
> +                                 false, false /* decode/encode srgb */);
> +      }
> +   }

I would put a newline here. Logic itself looks good to me, so either way
(including Matt's and Ian's comments):

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

> +   brw_render_cache_set_check_flush(brw, dst->bo);
> +   src->r8stencil_needs_update = false;
> +}
> +
>  static void *
>  intel_miptree_map_raw(struct brw_context *brw, struct intel_mipmap_tree *mt)
>  {
> diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
> index d344a06..24938f0 100644
> --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
> +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
> @@ -967,6 +967,10 @@ intel_miptree_updownsample(struct brw_context *brw,
>                             struct intel_mipmap_tree *src,
>                             struct intel_mipmap_tree *dst);
>  
> +void
> +intel_update_r8stencil(struct brw_context *brw,
> +                       struct intel_mipmap_tree *mt);
> +
>  /**
>   * Horizontal distance from one slice to the next in the two-dimensional
>   * miptree layout.
> -- 
> 2.8.0.rc3
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev