[Mesa-dev] [PATCH 2/2] i965: deindent blorp code.

[Matt Turner]

On Mon, May 23, 2016 at 5:00 PM, Dave Airlie <airlied at gmail.com> wrote:
> From: Dave Airlie <airlied at redhat.com>
>
> gcc6 warns about this.
>
> Signed-off-by: Dave Airlie <airlied at 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;
> +   }

I did some archaeology. Looks like this has been misindented since

commit 19e9b24626c2b9d7abef054d57bb2a52106c545b
Author: Paul Berry <stereotype441 at gmail.com>
Date:   Sun Apr 29 21:41:42 2012 -0700

    i965/gen6: Initial implementation of MSAA.