summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/brw_misc_state.c4
-rw-r--r--src/mesa/drivers/dri/i965/brw_state_upload.c30
2 files changed, 9 insertions, 25 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_misc_state.c b/src/mesa/drivers/dri/i965/brw_misc_state.c
index c36a287d81..b4e7dd547f 100644
--- a/src/mesa/drivers/dri/i965/brw_misc_state.c
+++ b/src/mesa/drivers/dri/i965/brw_misc_state.c
@@ -485,6 +485,8 @@ const struct brw_tracked_state brw_line_stipple = {
static void upload_invarient_state( struct brw_context *brw )
{
+ struct intel_context *intel = &brw->intel;
+
{
/* 0x61040000 Pipeline Select */
/* PipelineSelect : 0 */
@@ -496,7 +498,7 @@ static void upload_invarient_state( struct brw_context *brw )
BRW_BATCH_STRUCT(brw, &ps);
}
- {
+ if (intel->gen < 6) {
struct brw_global_depth_offset_clamp gdo;
memset(&gdo, 0, sizeof(gdo));
diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c
index 9874d725bb..6f214b037e 100644
--- a/src/mesa/drivers/dri/i965/brw_state_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_state_upload.c
@@ -109,18 +109,13 @@ const struct brw_tracked_state *gen6_atoms[] =
&brw_wm_input_sizes,
&brw_vs_prog,
&brw_gs_prog,
-#if 0
&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,
-#endif
&gen6_clip_vp,
&gen6_sf_vp,
&gen6_cc_vp,
+
+ /* Command packets: */
&gen6_viewport_state, /* must do after *_vp stages */
&gen6_urb,
@@ -133,43 +128,30 @@ const struct brw_tracked_state *gen6_atoms[] =
&brw_wm_constant_surface, /* must do before wm surfaces/bind bo */
&brw_wm_surfaces, /* must do before samplers and unit */
+ &brw_wm_samplers,
+
&gen6_vs_state,
&gen6_gs_state,
&gen6_clip_state,
-#if 0
- &brw_wm_samplers,
-
- &brw_wm_unit,
-#endif
&gen6_sf_state,
+ /* &gen6_wm_state, */
&gen6_scissor_state,
-#if 0
- /* Command packets:
- */
&brw_invarient_state,
-#endif
&brw_state_base_address,
-#if 0
- &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,
-#endif
-
&brw_drawing_rect,
&brw_indices,