[Mesa-dev] [v4 06/11] i965/blorp: Prepare blits for lossless compression

[Pohjolainen, Topi]

On Thu, May 05, 2016 at 11:01:54PM -0700, Ben Widawsky wrote:
> On Thu, Apr 21, 2016 at 02:59:01PM +0300, Topi Pohjolainen wrote:
> > Signed-off-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
> > ---
> >  src/mesa/drivers/dri/i965/brw_blorp.cpp      |  2 +-
> >  src/mesa/drivers/dri/i965/brw_blorp_blit.cpp | 26 +++++++++++++++++++++-----
> >  2 files changed, 22 insertions(+), 6 deletions(-)
> > 
> > diff --git a/src/mesa/drivers/dri/i965/brw_blorp.cpp b/src/mesa/drivers/dri/i965/brw_blorp.cpp
> > index 5ffc5b4..d23d212 100644
> > --- a/src/mesa/drivers/dri/i965/brw_blorp.cpp
> > +++ b/src/mesa/drivers/dri/i965/brw_blorp.cpp
> > @@ -58,7 +58,7 @@ brw_blorp_mip_info::set(struct intel_mipmap_tree *mt,
> >      */
> >     if (mt->msaa_layout == INTEL_MSAA_LAYOUT_UMS ||
> >         mt->msaa_layout == INTEL_MSAA_LAYOUT_CMS) {
> > -      assert(layer % mt->num_samples == 0);
> > +      assert(mt->num_samples <= 1 || layer % mt->num_samples == 0);
> 
> Hmm. Can you explain this hunk to me? It /seems/ wrong, but I am not as
> intimately familiar as you are.

As we re-use CMS layout also for lossless compression, we end up here. I need
to re-check the details, but I hit this with piglit tests. I'm just rebasing
with your comments, I'l get back here once I have it running again.

> 
> >     }
> >  
> >     intel_miptree_check_level_layer(mt, level, layer);
> > diff --git a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
> > index 30206f2..f33f4e1 100644
> > --- a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
> > +++ b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
> > @@ -72,12 +72,7 @@ brw_blorp_blit_miptrees(struct brw_context *brw,
> >      * the destination buffer because we use the standard render path to render
> >      * to destination color buffers, and the standard render path is
> >      * fast-color-aware.
> > -    * Lossless compression is only introduced for gen9 onwards whereas
> > -    * blorp is not supported even for gen8. Therefore it should be impossible
> > -    * to end up here with single sampled compressed surfaces.
> >      */
> > -   assert(!intel_miptree_is_lossless_compressed(brw, src_mt));
> > -   assert(!intel_miptree_is_lossless_compressed(brw, dst_mt));
> >     intel_miptree_resolve_color(brw, src_mt, 0);
> >     intel_miptree_slice_resolve_depth(brw, src_mt, src_level, src_layer);
> >     intel_miptree_slice_resolve_depth(brw, dst_mt, dst_level, dst_layer);
> > @@ -1894,6 +1889,14 @@ compute_msaa_layout_for_pipeline(struct brw_context *brw, unsigned num_samples,
> >                                   intel_msaa_layout true_layout)
> >  {
> >     if (num_samples <= 1) {
> > +      /* Layout is used to determine if ld2dms is needed for sampling. In
> > +       * single sampled case normal ld is enough avoiding also the need to
> > +       * fetch mcs. Therefore simply set the layout to none.
> > +       */
> > +      if (brw->gen >= 9 && true_layout == INTEL_MSAA_LAYOUT_CMS) {
> > +         return INTEL_MSAA_LAYOUT_NONE;
> > +      }
> > +
> >        /* When configuring the GPU for non-MSAA, we can still accommodate IMS
> >         * format buffers, by transforming coordinates appropriately.
> >         */
> > @@ -2072,6 +2075,19 @@ brw_blorp_blit_params::brw_blorp_blit_params(struct brw_context *brw,
> >     wm_prog_key.src_layout = src_mt->msaa_layout;
> >     wm_prog_key.dst_layout = dst_mt->msaa_layout;
> >  
> > +   /* On gen9+ compressed single sampled buffers carry the same layout type as
> > +    * multisampled. The difference is that they can be sampled using normal
> > +    * ld message and as render target behave just like non-compressed surface
> > +    * from compiler point of view. Therefore override the type in the program
> > +    * key.
> > +    */
> > +   if (brw->gen >= 9 && src.num_samples <= 1 &&
> > +       src_mt->msaa_layout == INTEL_MSAA_LAYOUT_CMS)
> > +      wm_prog_key.src_layout = INTEL_MSAA_LAYOUT_NONE;
> > +   if (brw->gen >= 9 && dst.num_samples <= 1 &&
> > +       dst_mt->msaa_layout == INTEL_MSAA_LAYOUT_CMS)
> > +      wm_prog_key.dst_layout = INTEL_MSAA_LAYOUT_NONE;
> > +
> >     wm_prog_key.src_tiled_w = src.map_stencil_as_y_tiled;
> >     wm_prog_key.dst_tiled_w = dst.map_stencil_as_y_tiled;
> >     /* Round floating point values to nearest integer to avoid "off by one texel"
> 
> With sufficient answer to my question:
> Reviewed-by: Ben Widawsky <ben at bwidawsk.net>