Mesa (i965g-restart): i965g: remove/disable inactive state atoms

[Keith Whitwell]

Module: Mesa
Branch: i965g-restart
Commit: 018e2250b860df75485d1c7741dfa010c39ae6f1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=018e2250b860df75485d1c7741dfa010c39ae6f1

Author: Keith Whitwell <keithw at vmware.com>
Date:   Fri Nov  6 08:33:10 2009 +0000

i965g: remove/disable inactive state atoms

---

 src/gallium/drivers/i965/brw_misc_state.c   |    2 +-
 src/gallium/drivers/i965/brw_screen.c       |    1 +
 src/gallium/drivers/i965/brw_state.h        |    2 --
 src/gallium/drivers/i965/brw_state_upload.c |    4 +---
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/i965/brw_misc_state.c b/src/gallium/drivers/i965/brw_misc_state.c
index 8e35f9a..ce3e48f 100644
--- a/src/gallium/drivers/i965/brw_misc_state.c
+++ b/src/gallium/drivers/i965/brw_misc_state.c
@@ -404,7 +404,7 @@ static int upload_invarient_state( struct brw_context *brw )
       BRW_BATCH_STRUCT(brw, &sip);
    }
 
-
+   /* VF Statistics */
    {
       struct brw_vf_statistics vfs;
       memset(&vfs, 0, sizeof(vfs));
diff --git a/src/gallium/drivers/i965/brw_screen.c b/src/gallium/drivers/i965/brw_screen.c
index 7991f4a..04a3f81 100644
--- a/src/gallium/drivers/i965/brw_screen.c
+++ b/src/gallium/drivers/i965/brw_screen.c
@@ -291,6 +291,7 @@ brw_create_screen(struct brw_winsys_screen *sws, uint pci_id)
 #ifdef DEBUG
    BRW_DEBUG = debug_get_flags_option("BRW_DEBUG", debug_names, 0);
    BRW_DEBUG |= debug_get_flags_option("INTEL_DEBUG", debug_names, 0);
+   BRW_DEBUG |= DEBUG_STATS;
 #endif
 
    memset(&chipset, 0, sizeof chipset);
diff --git a/src/gallium/drivers/i965/brw_state.h b/src/gallium/drivers/i965/brw_state.h
index 97710ab..a9b8165 100644
--- a/src/gallium/drivers/i965/brw_state.h
+++ b/src/gallium/drivers/i965/brw_state.h
@@ -52,7 +52,6 @@ brw_add_validated_bo(struct brw_context *brw, struct brw_winsys_buffer *bo)
 const struct brw_tracked_state brw_blend_constant_color;
 const struct brw_tracked_state brw_cc_unit;
 const struct brw_tracked_state brw_cc_vp;
-const struct brw_tracked_state brw_check_fallback;
 const struct brw_tracked_state brw_clip_prog;
 const struct brw_tracked_state brw_clip_unit;
 const struct brw_tracked_state brw_curbe_buffer;
@@ -65,7 +64,6 @@ const struct brw_tracked_state brw_aa_line_parameters;
 const struct brw_tracked_state brw_pipelined_state_pointers;
 const struct brw_tracked_state brw_binding_table_pointers;
 const struct brw_tracked_state brw_depthbuffer;
-const struct brw_tracked_state brw_polygon_stipple_offset;
 const struct brw_tracked_state brw_polygon_stipple;
 const struct brw_tracked_state brw_program_parameters;
 const struct brw_tracked_state brw_recalculate_urb_fence;
diff --git a/src/gallium/drivers/i965/brw_state_upload.c b/src/gallium/drivers/i965/brw_state_upload.c
index fdcdd59..233dce0 100644
--- a/src/gallium/drivers/i965/brw_state_upload.c
+++ b/src/gallium/drivers/i965/brw_state_upload.c
@@ -38,8 +38,6 @@
 
 const struct brw_tracked_state *atoms[] =
 {
-   &brw_check_fallback,
-
 //   &brw_wm_input_sizes,
    &brw_vs_prog,
    &brw_gs_prog, 
@@ -58,7 +56,7 @@ const struct brw_tracked_state *atoms[] =
    &brw_cc_unit,
 
    &brw_vs_surfaces,		/* must do before unit */
-   &brw_wm_constant_surface,	/* must do before wm surfaces/bind bo */
+   //&brw_wm_constant_surface,	/* must do before wm surfaces/bind bo */
    &brw_wm_surfaces,		/* must do before samplers and unit */
    &brw_wm_samplers,