[Mesa-stable] [Mesa-dev] [PATCH] i965/blorp: Use the correct ISL format for combined depth/stencil

[Pohjolainen, Topi]

On Mon, Jan 23, 2017 at 04:53:07PM -0800, Chad Versace wrote:
> On Mon 23 Jan 2017, Jason Ekstrand wrote:
> > In brw_blorp_copyteximage, we use the format from the render buffer.
> > This could be a combined depth/stencil format.  In this case, we handle
> > stencil properly but we give blorp the wrong ISL format.  Specifically,
> > we would give blorp ISL_FORMAT_R32G32B32A32_FLOAT which is the wrong
> > size was causing GPU hangs.
> > 
> > Fixes: GL45-CTS.gtf30.GL3Tests.packed_depth_stencil.packed_depth_stencil_copyteximage
> > 
> > Cc: "13.0 17.0" <mesa-stable at lists.freedesktop.org>
> > Cc: Kenneth Graunke <kenneth at whitecape.org>
> > ---
> >  src/mesa/drivers/dri/i965/brw_blorp.c | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c b/src/mesa/drivers/dri/i965/brw_blorp.c
> > index d79f529..3a7cf84 100644
> > --- a/src/mesa/drivers/dri/i965/brw_blorp.c
> > +++ b/src/mesa/drivers/dri/i965/brw_blorp.c
> > @@ -284,8 +284,10 @@ brw_blorp_to_isl_format(struct brw_context *brw, mesa_format format,
> >     case MESA_FORMAT_S_UINT8:
> >        return ISL_FORMAT_R8_UINT;
> >     case MESA_FORMAT_Z24_UNORM_X8_UINT:
> > +   case MESA_FORMAT_Z24_UNORM_S8_UINT:
> >        return ISL_FORMAT_R24_UNORM_X8_TYPELESS;
> >     case MESA_FORMAT_Z_FLOAT32:
> > +   case MESA_FORMAT_Z32_FLOAT_S8X24_UINT:
> >        return ISL_FORMAT_R32_FLOAT;
> >     case MESA_FORMAT_Z_UNORM16:
> >        return ISL_FORMAT_R16_UNORM;
> 
> Locally, this looks correct to me.
> 
> Reviewed-by: Chad Versace <chadversary at chromium.org>

Me too:

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