i965: Move PIPELINE_SELECT to the top of gen6 3d pipeline setup.

diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c
index 824502ca6ebf0265a210df9f351f214a0609b6d5..aa83d7ad18e33b4ee5d2d56bc2d57809895fc157 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_state_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_state_upload.c
@@ -116,6 +116,8 @@ const struct brw_tracked_state *gen6_atoms[] =
    &gen6_cc_vp,
 
    /* Command packets: */
+   &brw_invarient_state,
+
    &gen6_viewport_state,       /* must do after *_vp stages */
 
    &gen6_urb,
@@ -138,8 +140,6 @@ const struct brw_tracked_state *gen6_atoms[] =
 
    &gen6_scissor_state,
 
-   &brw_invarient_state,
-
    &brw_state_base_address,
 
    &gen6_binding_table_pointers,