From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Tue, 9 Aug 2016 22:45:04 +0000 (-0700)
Subject: i965/blorp/gen8: Move viewport setup to after wm state
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5e2dd7a381b198b40f695f3ab9f0761787470fa7;p=mesa.git

i965/blorp/gen8: Move viewport setup to after wm state

This matches gen6 and gen7.

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

diff --git a/src/mesa/drivers/dri/i965/gen8_blorp.c b/src/mesa/drivers/dri/i965/gen8_blorp.c
index 50859237308..2e90438fb3d 100644
--- a/src/mesa/drivers/dri/i965/gen8_blorp.c
+++ b/src/mesa/drivers/dri/i965/gen8_blorp.c
@@ -509,7 +509,6 @@ gen8_blorp_exec(struct brw_context *brw, const struct brw_blorp_params *params)
 
    brw_upload_state_base_address(brw);
 
-   gen7_blorp_emit_cc_viewport(brw);
    gen7_l3_state.emit(brw);
 
    gen7_blorp_emit_urb_config(brw, params);
@@ -564,6 +563,8 @@ gen8_blorp_exec(struct brw_context *brw, const struct brw_blorp_params *params)
 
    gen8_blorp_emit_wm_state(brw);
 
+   gen7_blorp_emit_cc_viewport(brw);
+
    gen8_blorp_emit_depth_disable(brw);
    gen7_blorp_emit_clear_params(brw, params);
    gen6_blorp_emit_drawing_rectangle(brw, params);