i965: Assert that an OPCODE_IF was seen before an OPCODE_ELSE.

[mesa.git] / src / mesa / drivers / dri / i965 / brw_state_upload.c

diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c
index 3e6c967f53413240e46ae4732c622fd7e7ad2a68..9e54f29f0f6fd1df028dcfb772a8d39508043882 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_state_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_state_upload.c
@@ -109,21 +109,15 @@ const struct brw_tracked_state *gen6_atoms[] =
    &brw_wm_input_sizes,
    &brw_vs_prog,
    &brw_gs_prog,
-#if 0
-   &brw_sf_prog,
    &brw_wm_prog,
 
-   /* Once all the programs are done, we know how large urb entry
-    * sizes need to be and can decide if we need to change the urb
-    * layout.
-    */
-   &brw_curbe_offsets,
-
-
-#endif
    &gen6_clip_vp,
    &gen6_sf_vp,
    &gen6_cc_vp,
+
+   /* Command packets: */
+   &brw_invarient_state,
+
    &gen6_viewport_state,       /* must do after *_vp stages */
 
    &gen6_urb,
@@ -136,43 +130,29 @@ const struct brw_tracked_state *gen6_atoms[] =
    &brw_wm_constant_surface,   /* must do before wm surfaces/bind bo */
    &brw_wm_surfaces,           /* must do before samplers and unit */
 
+   &brw_wm_samplers,
+   &gen6_sampler_state,
+
    &gen6_vs_state,
    &gen6_gs_state,
    &gen6_clip_state,
-#if 0
-   &brw_wm_samplers,
+   &gen6_sf_state,
+   &gen6_wm_state,
 
-   &brw_wm_unit,
-#endif
    &gen6_scissor_state,
 
-#if 0
-   &brw_sf_unit,
-
-   /* Command packets:
-    */
-   &brw_invarient_state,
-#endif
-
    &brw_state_base_address,
 
-#if 0
-   &brw_binding_table_pointers,
-   &brw_blend_constant_color,
-#endif
+   &gen6_binding_table_pointers,
 
    &brw_depthbuffer,
 
-#if 0
    &brw_polygon_stipple,
    &brw_polygon_stipple_offset,
 
    &brw_line_stipple,
    &brw_aa_line_parameters,
 
-   &brw_psp_urb_cbs,
-#endif
-
    &brw_drawing_rect,
 
    &brw_indices,