aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965/brw_state_upload.c
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2011-02-02 16:00:08 -0800
committerKenneth Graunke <[email protected]>2011-05-17 23:32:59 -0700
commita924d69b57a82c02f2d4fba3fc0b31bf6a4f744e (patch)
tree514c0bc185cc7d6601b83b06d4e0c4cb6d4d4c19 /src/mesa/drivers/dri/i965/brw_state_upload.c
parent7d608d0c331c101088273655708965fb9f1be56e (diff)
i965: Initial Ivybridge WM/PS state setup.
Copied from gen6_wm_state.c. The main change from Sandybridge seems to be that 3DSTATE_WM was split into two separate state packet commands: 3DSTATE_WM and 3DSTATE_PS. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
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, 3 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c
index e2c690ee568..accc8d47b54 100644
--- a/src/mesa/drivers/dri/i965/brw_state_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_state_upload.c
@@ -200,7 +200,7 @@ const struct brw_tracked_state *gen7_atoms[] =
&brw_vs_constants, /* Before vs_surfaces and constant_buffer */
&brw_wm_constants, /* Before wm_surfaces and constant_buffer */
&gen6_vs_constants, /* Before vs_state */
- &gen6_wm_constants, /* Before wm_state */
+ &gen7_wm_constants, /* Before wm_state */
&brw_vs_surfaces, /* must do before unit */
&brw_wm_constant_surface, /* must do before wm surfaces/bind bo */
@@ -215,7 +215,8 @@ const struct brw_tracked_state *gen7_atoms[] =
&gen6_clip_state,
&gen7_sbe_state,
&gen7_sf_state,
- &gen6_wm_state,
+ &gen7_wm_state,
+ &gen7_ps_state,
&gen6_scissor_state,