i965: Remove the invalidate_state() vtable hook.

The hook was a noop.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>

diff --git a/src/mesa/drivers/dri/i965/brw_vtbl.c b/src/mesa/drivers/dri/i965/brw_vtbl.c
index 830bc7cb51e660e339ea657872742507335126e5..cd51c91c802bb6f4a62958d807eb6ef41a489dcd 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_vtbl.c
+++ b/src/mesa/drivers/dri/i965/brw_vtbl.c
@@ -154,11 +154,6 @@ static void brw_new_batch( struct intel_context *intel )
       brw_collect_and_report_shader_time(brw);
 }
 
-static void brw_invalidate_state( struct intel_context *intel, GLuint new_state )
-{
-   /* nothing */
-}
-
 /**
  * \see intel_context.vtbl.is_hiz_depth_format
  */
@@ -182,7 +177,6 @@ static bool brw_is_hiz_depth_format(struct intel_context *intel,
 
 void brwInitVtbl( struct brw_context *brw )
 {
-   brw->intel.vtbl.invalidate_state = brw_invalidate_state;
    brw->intel.vtbl.new_batch = brw_new_batch;
    brw->intel.vtbl.finish_batch = brw_finish_batch;
    brw->intel.vtbl.destroy = brw_destroy_context;

diff --git a/src/mesa/drivers/dri/i965/intel_context.c b/src/mesa/drivers/dri/i965/intel_context.c
index ca3123a479e2a9b65104ba600f2579594d2c2c76..cf0060382b1592b340e04dde4898e9290f7b5e8b 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_context.c
+++ b/src/mesa/drivers/dri/i965/intel_context.c
@@ -333,9 +333,6 @@ intelInvalidateState(struct gl_context * ctx, GLuint new_state)
    _vbo_InvalidateState(ctx, new_state);
 
    intel->NewGLState |= new_state;
-
-   if (intel->vtbl.invalidate_state)
-      intel->vtbl.invalidate_state( intel, new_state );
 }
 
 void

diff --git a/src/mesa/drivers/dri/i965/intel_context.h b/src/mesa/drivers/dri/i965/intel_context.h
index 38ccdba4aa32f53285240eb2db0e4962ca965ae1..90a10fa0bf0ce307f9726e5c3579477e34ed5f1d 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_context.h
+++ b/src/mesa/drivers/dri/i965/intel_context.h
@@ -119,9 +119,6 @@ struct intel_context
       void (*finish_batch) (struct intel_context * intel);
       void (*new_batch) (struct intel_context * intel);
 
-      void (*invalidate_state) (struct intel_context *intel,
-                               GLuint new_state);
-
       void (*debug_batch)(struct intel_context *intel);
       void (*annotate_aub)(struct intel_context *intel);
       bool (*render_target_supported)(struct intel_context *intel,