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

[Pohjolainen, Topi]

On Fri, May 06, 2016 at 09:30:27AM +0300, Pohjolainen, Topi wrote:
> 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.

It was as I suspected, we use both mt->num_samples == 1 and == 0 for
single sampled - latter won't work with %-operand.