summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/i965/brw_state_upload.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-06-11 15:35:52 -0700
committerEric Anholt <eric@anholt.net>2010-06-12 21:47:31 -0700
commit0f59b9a95d21dc79e98bce4ece3eab19e32ca80a (patch)
treed7a10e714e6a3e8e5d65cb3ef9846243d1ef89e6 /src/mesa/drivers/dri/i965/brw_state_upload.c
parent7ad26b0030f6b14e6ec069eafdec6faf75e8007c (diff)
i965: Update gen6 paths for the streaming rework.
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_state_upload.c')
-rw-r--r--src/mesa/drivers/dri/i965/brw_state_upload.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c
index fac57c935f..f92a19c2aa 100644
--- a/src/mesa/drivers/dri/i965/brw_state_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_state_upload.c
@@ -116,7 +116,6 @@ const struct brw_tracked_state *gen6_atoms[] =
&gen6_clip_vp,
&gen6_sf_vp,
- &gen6_cc_vp,
/* Command packets: */
&brw_invarient_state,
@@ -129,9 +128,13 @@ const struct brw_tracked_state *gen6_atoms[] =
&gen6_depth_stencil_state, /* must do before cc unit */
&gen6_cc_state_pointers,
+ &brw_vs_constants, /* Before vs_surfaces and constant_buffer */
+ &brw_wm_constants, /* Before wm_surfaces and constant_buffer */
+
&brw_vs_surfaces, /* must do before unit */
&brw_wm_constant_surface, /* must do before wm surfaces/bind bo */
&brw_wm_surfaces, /* must do before samplers and unit */
+ &brw_wm_binding_table,
&brw_wm_samplers,
&gen6_sampler_state,