i965/blorp/gen7-8: Emit depth stencil state with CC and BLEND

All three go together on SNB so let's keep them together for gen7+ as well.

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>

diff --git a/src/mesa/drivers/dri/i965/gen7_blorp.c b/src/mesa/drivers/dri/i965/gen7_blorp.c
index ce7047b7ccd38128dc42b19217149e810ab62b56..122f37fab49f9d1cde2e28a0fae7b5c3dfe048d9 100644 (file)
--- a/src/mesa/drivers/dri/i965/gen7_blorp.c
+++ b/src/mesa/drivers/dri/i965/gen7_blorp.c
@@ -481,6 +481,8 @@ gen7_blorp_exec(struct brw_context *brw,
       gen7_blorp_emit_blend_state_pointer(brw, cc_blend_state_offset);
       gen7_blorp_emit_cc_state_pointer(brw, cc_state_offset);
    }
+   depthstencil_offset = gen6_blorp_emit_depth_stencil_state(brw, params);
+   gen7_blorp_emit_depth_stencil_state_pointers(brw, depthstencil_offset);
 
    gen7_blorp_disable_constant_state(brw, _3DSTATE_CONSTANT_VS);
    gen7_blorp_disable_constant_state(brw, _3DSTATE_CONSTANT_HS);
@@ -488,8 +490,6 @@ gen7_blorp_exec(struct brw_context *brw,
    gen7_blorp_disable_constant_state(brw, _3DSTATE_CONSTANT_GS);
    gen7_blorp_disable_constant_state(brw, _3DSTATE_CONSTANT_PS);
 
-   depthstencil_offset = gen6_blorp_emit_depth_stencil_state(brw, params);
-   gen7_blorp_emit_depth_stencil_state_pointers(brw, depthstencil_offset);
    if (brw->use_resource_streamer)
       gen7_disable_hw_binding_tables(brw);
    if (params->wm_prog_data) {

diff --git a/src/mesa/drivers/dri/i965/gen8_blorp.c b/src/mesa/drivers/dri/i965/gen8_blorp.c
index d8860be4d5d533a01206a850a8f28046fec5eeb6..5085923730871d556e4c90be15a83934d3b5e30e 100644 (file)
--- a/src/mesa/drivers/dri/i965/gen8_blorp.c
+++ b/src/mesa/drivers/dri/i965/gen8_blorp.c
@@ -521,6 +521,8 @@ gen8_blorp_exec(struct brw_context *brw, const struct brw_blorp_params *params)
    const uint32_t cc_state_offset = gen6_blorp_emit_cc_state(brw);
    gen7_blorp_emit_cc_state_pointer(brw, cc_state_offset);
 
+   gen8_blorp_emit_depth_stencil_state(brw, params);
+
    gen8_blorp_disable_constant_state(brw, _3DSTATE_CONSTANT_VS);
    gen8_blorp_disable_constant_state(brw, _3DSTATE_CONSTANT_HS);
    gen8_blorp_disable_constant_state(brw, _3DSTATE_CONSTANT_DS);
@@ -560,7 +562,6 @@ gen8_blorp_exec(struct brw_context *brw, const struct brw_blorp_params *params)
 
    gen8_blorp_emit_ps_config(brw, params);
 
-   gen8_blorp_emit_depth_stencil_state(brw, params);
    gen8_blorp_emit_wm_state(brw);
 
    gen8_blorp_emit_depth_disable(brw);