On Tue, Feb 09, 2016 at 03:40:07PM -0800, Ben Widawsky wrote:
> On Mon, Feb 08, 2016 at 06:51:31PM +0200, Topi Pohjolainen wrote:
> > The assertion is inside a condition mandating num_samples > 1 and
> > therefore the first half of the constraint is always met. The
> > second half in turn would only be applicable for single sampled
> > case and moreover it is trying to falsely check against surface
> > type instead of format.
>
>
> Oops.
>
> > Subsequent patches will introduce proper support for the lossless
> > compression and dropping this here makes the patches a little
> > simpler.
> >
> > Signed-off-by: Topi Pohjolainen <topi.pohjolai...@intel.com>
> > ---
> > src/mesa/drivers/dri/i965/gen8_surface_state.c | 6 ------
> > 1 file changed, 6 deletions(-)
> >
> > diff --git a/src/mesa/drivers/dri/i965/gen8_surface_state.c
> > b/src/mesa/drivers/dri/i965/gen8_surface_state.c
> > index 0df25d2..fc8f701 100644
> > --- a/src/mesa/drivers/dri/i965/gen8_surface_state.c
> > +++ b/src/mesa/drivers/dri/i965/gen8_surface_state.c
> > @@ -243,12 +243,6 @@ gen8_emit_texture_surface_state(struct brw_context
> > *brw,
> > */
> > if (brw->gen >= 9 || mt->num_samples == 1)
> > assert(mt->halign == 16);
> > -
> > - if (brw->gen >= 9) {
> > - assert(mt->num_samples > 1 ||
> > - brw_losslessly_compressible_format(brw, surf_type));
> > - }
> > -
> > }
> >
> > uint32_t *surf = allocate_surface_state(brw, surf_offset, surf_index);
>
> Seems fine to drop the assertion entirely instead of correcting it.
> You could mention the two patches which touched this part of the code if you
> wanted, or perhaps you realized you reviewed both of them :P
I did :)
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
