&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,
+ &gen6_clip_vp,
+ &gen6_sf_vp,
+ &gen6_cc_vp,
- &brw_cc_vp,
+ /* Command packets: */
+ &brw_invarient_state,
+
+ &gen6_viewport_state, /* must do after *_vp stages */
-#endif
&gen6_urb,
&gen6_blend_state, /* must do before cc unit */
&gen6_color_calc_state, /* must do before cc unit */
&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,
- &brw_sf_vp,
- &brw_sf_unit,
+ &gen6_scissor_state,
- /* Command packets:
- */
- &brw_invarient_state,
&brw_state_base_address,
- &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,
-
&brw_drawing_rect,
-#endif
&brw_indices,
&brw_index_buffer,