On Tue, May 24, 2016 at 10:00:07AM +1000, Dave Airlie wrote: > From: Dave Airlie <airl...@redhat.com> > > gcc6 warns about this.
Thanks for doing this, it has been on my list, just kept forgetting it. Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com> > > Signed-off-by: Dave Airlie <airl...@redhat.com> > --- > src/mesa/drivers/dri/i965/gen7_blorp.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/src/mesa/drivers/dri/i965/gen7_blorp.c > b/src/mesa/drivers/dri/i965/gen7_blorp.c > index 3584864..270fe57 100644 > --- a/src/mesa/drivers/dri/i965/gen7_blorp.c > +++ b/src/mesa/drivers/dri/i965/gen7_blorp.c > @@ -491,16 +491,16 @@ gen7_blorp_emit_wm_config(struct brw_context *brw, > if (params->src.mt) > dw1 |= GEN7_WM_KILL_ENABLE; /* TODO: temporarily smash on */ > > - if (params->dst.num_samples > 1) { > - dw1 |= GEN7_WM_MSRAST_ON_PATTERN; > - if (prog_data && prog_data->persample_msaa_dispatch) > - dw2 |= GEN7_WM_MSDISPMODE_PERSAMPLE; > - else > - dw2 |= GEN7_WM_MSDISPMODE_PERPIXEL; > - } else { > - dw1 |= GEN7_WM_MSRAST_OFF_PIXEL; > + if (params->dst.num_samples > 1) { > + dw1 |= GEN7_WM_MSRAST_ON_PATTERN; > + if (prog_data && prog_data->persample_msaa_dispatch) > dw2 |= GEN7_WM_MSDISPMODE_PERSAMPLE; > - } > + else > + dw2 |= GEN7_WM_MSDISPMODE_PERPIXEL; > + } else { > + dw1 |= GEN7_WM_MSRAST_OFF_PIXEL; > + dw2 |= GEN7_WM_MSDISPMODE_PERSAMPLE; > + } > > BEGIN_BATCH(3); > OUT_BATCH(_3DSTATE_WM << 16 | (3 - 2)); > -- > 2.5.5 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev