---
I've split this from the patch that implements the L3 state atom so I
can move it after the state leak work-around in order to avoid
temporary regressions.
src/mesa/drivers/dri/i965/brw_context.h | 4 ++--
src/mesa/drivers/dri/i965/brw_state_upload.c | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_context.h
b/src/mesa/drivers/dri/i965/brw_context.h
index 36ce357..1190c31 100644
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -1526,8 +1526,8 @@ struct brw_context
} perfmon;
int num_atoms[BRW_NUM_PIPELINES];
- const struct brw_tracked_state render_atoms[60];
- const struct brw_tracked_state compute_atoms[5];
+ const struct brw_tracked_state render_atoms[61];
+ const struct brw_tracked_state compute_atoms[6];
/* If (INTEL_DEBUG & DEBUG_BATCH) */
struct {
diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c
b/src/mesa/drivers/dri/i965/brw_state_upload.c
index db1e3c0..4844cd0 100644
--- a/src/mesa/drivers/dri/i965/brw_state_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_state_upload.c
@@ -186,6 +186,7 @@ static const struct brw_tracked_state *gen7_render_atoms[] =
&brw_cc_vp,
&gen7_sf_clip_viewport,
+ &gen7_l3_state,
&gen7_push_constant_space,
&gen7_urb,
&gen6_blend_state, /* must do before cc unit */
@@ -257,6 +258,7 @@ static const struct brw_tracked_state *gen7_render_atoms[] =
static const struct brw_tracked_state *gen7_compute_atoms[] =
{
&brw_state_base_address,
+ &gen7_l3_state,
&brw_cs_image_surfaces,
&gen7_cs_push_constants,
&brw_cs_abo_surfaces,
@@ -271,6 +273,7 @@ static const struct brw_tracked_state *gen8_render_atoms[] =
&brw_cc_vp,
&gen8_sf_clip_viewport,
+ &gen7_l3_state,
&gen7_push_constant_space,
&gen7_urb,
&gen8_blend_state,
@@ -348,6 +351,7 @@ static const struct brw_tracked_state *gen8_render_atoms[] =
static const struct brw_tracked_state *gen8_compute_atoms[] =
{
&gen8_state_base_address,
+ &gen7_l3_state,
&brw_cs_image_surfaces,
&gen7_cs_push_constants,
&brw_cs_abo_surfaces,
--
2.4.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
