From 8b89c92ef602155907a73176ff3393d00a139fc6 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 24 May 2016 09:52:10 +1000 Subject: [PATCH] i965: deindent blorp code. gcc6 warns about this. Acked-by: Matt Turner Signed-off-by: Dave Airlie --- 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 3584864417a..270fe57ccaf 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.11.0