i965/gen7_wm: Move where we set the fast clear op
authorJason Ekstrand <jason.ekstrand@intel.com>
Thu, 28 Apr 2016 21:40:51 +0000 (14:40 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Sat, 14 May 2016 20:34:21 +0000 (13:34 -0700)
This better matches gen8 state setup

Acked-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
src/mesa/drivers/dri/i965/gen7_wm_state.c

index 17dea99a03d513cea7e5b08ef6821abb4afc09a7..8d2e2c32bb4c49ef7b246088a4ef2b4d06c3280c 100644 (file)
@@ -214,6 +214,8 @@ gen7_upload_ps_state(struct brw_context *brw,
    if (prog_data->num_varying_inputs != 0)
       dw4 |= GEN7_PS_ATTRIBUTE_ENABLE;
 
+   dw4 |= fast_clear_op;
+
    if (prog_data->prog_offset_16 || prog_data->no_8) {
       dw4 |= GEN7_PS_16_DISPATCH_ENABLE;
 
@@ -243,8 +245,6 @@ gen7_upload_ps_state(struct brw_context *brw,
       ksp0 = stage_state->prog_offset;
    }
 
-   dw4 |= fast_clear_op;
-
    BEGIN_BATCH(8);
    OUT_BATCH(_3DSTATE_PS << 16 | (8 - 2));
    OUT_BATCH(ksp0);