summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/i965/brw_state_upload.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-01-29 11:18:26 -0800
committerEric Anholt <eric@anholt.net>2010-02-25 10:53:06 -0800
commit7ee590424c974cb10882e9c4664a6024595fc9de (patch)
tree01b172bf9f3ed059fbe0d24a8685b2838f9a7890 /src/mesa/drivers/dri/i965/brw_state_upload.c
parent9dce60f35b25f4f5605b22d75447bac5d9f55515 (diff)
i965: Start adding support for the Sandybridge CC unit.
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_state_upload.c')
-rw-r--r--src/mesa/drivers/dri/i965/brw_state_upload.c7
1 files changed, 6 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 afa940962f..ed9e18f33c 100644
--- a/src/mesa/drivers/dri/i965/brw_state_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_state_upload.c
@@ -122,9 +122,13 @@ const struct brw_tracked_state *gen6_atoms[] =
&brw_recalculate_urb_fence,
&brw_cc_vp,
- &brw_cc_unit,
#endif
+ &gen6_blend_state, /* must do before cc unit */
+ &gen6_color_calc_state, /* must do before cc unit */
+ &gen6_depth_stencil_state, /* must do before cc unit */
+ &gen6_cc_state_pointers,
+
&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 */
@@ -282,6 +286,7 @@ static struct dirty_bit_map brw_bits[] = {
};
static struct dirty_bit_map cache_bits[] = {
+ DEFINE_BIT(CACHE_NEW_BLEND_STATE),
DEFINE_BIT(CACHE_NEW_CC_VP),
DEFINE_BIT(CACHE_NEW_CC_UNIT),
DEFINE_BIT(CACHE_NEW_WM_PROG),