From 607338f1cbb063b1aeaf9d8120903a172c987411 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Fri, 28 Jun 2013 19:18:10 -0700 Subject: [PATCH] i965: Remove the invalidate_state() vtable hook. The hook was a noop. Signed-off-by: Kenneth Graunke Reviewed-by: Chad Versace --- src/mesa/drivers/dri/i965/brw_vtbl.c | 6 ------ src/mesa/drivers/dri/i965/intel_context.c | 3 --- src/mesa/drivers/dri/i965/intel_context.h | 3 --- 3 files changed, 12 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_vtbl.c b/src/mesa/drivers/dri/i965/brw_vtbl.c index 830bc7cb51e..cd51c91c802 100644 --- 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 ca3123a479e..cf0060382b1 100644 --- 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 38ccdba4aa3..90a10fa0bf0 100644 --- 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, -- 2.30.2