From c0151839473c83a2d0eea6285a649c1674466752 Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Wed, 16 Nov 2011 23:10:48 -0800 Subject: intel: Remove unused HiZ functions Remove the following functions: i830_hiz_resolve_noop i915_hiz_resolve_noop brw_hiz_resolve_noop My original strategy for how intel->vtbl.resolve_*buffer was used has substantially changed. The above functions are no longer called in the current strategy. Reviewed-by: Eric Anholt Signed-off-by: Chad Versace --- src/mesa/drivers/dri/i915/i830_vtbl.c | 9 --------- src/mesa/drivers/dri/i915/i915_vtbl.c | 9 --------- src/mesa/drivers/dri/i965/brw_vtbl.c | 9 --------- 3 files changed, 27 deletions(-) (limited to 'src/mesa/drivers') diff --git a/src/mesa/drivers/dri/i915/i830_vtbl.c b/src/mesa/drivers/dri/i915/i830_vtbl.c index 86c805148cd..d29f9799a86 100644 --- a/src/mesa/drivers/dri/i915/i830_vtbl.c +++ b/src/mesa/drivers/dri/i915/i830_vtbl.c @@ -885,13 +885,6 @@ i830_is_hiz_depth_format(struct intel_context *intel, gl_format format) return false; } -static void -i830_hiz_resolve_noop(struct intel_context *intel, - struct intel_region *region) -{ - /* empty */ -} - void i830InitVtbl(struct i830_context *i830) { @@ -910,6 +903,4 @@ i830InitVtbl(struct i830_context *i830) i830->intel.vtbl.invalidate_state = i830_invalidate_state; i830->intel.vtbl.render_target_supported = i830_render_target_supported; i830->intel.vtbl.is_hiz_depth_format = i830_is_hiz_depth_format; - i830->intel.vtbl.hiz_resolve_depthbuffer = i830_hiz_resolve_noop; - i830->intel.vtbl.hiz_resolve_hizbuffer = i830_hiz_resolve_noop; } diff --git a/src/mesa/drivers/dri/i915/i915_vtbl.c b/src/mesa/drivers/dri/i915/i915_vtbl.c index fa02dfa3654..072a692767a 100644 --- a/src/mesa/drivers/dri/i915/i915_vtbl.c +++ b/src/mesa/drivers/dri/i915/i915_vtbl.c @@ -852,13 +852,6 @@ i915_is_hiz_depth_format(struct intel_context *intel, return false; } -static void -i915_hiz_resolve_noop(struct intel_context *intel, - struct intel_region *region) -{ - /* empty */ -} - static void i915_invalidate_state(struct intel_context *intel, GLuint new_state) { @@ -887,6 +880,4 @@ i915InitVtbl(struct i915_context *i915) i915->intel.vtbl.invalidate_state = i915_invalidate_state; i915->intel.vtbl.render_target_supported = i915_render_target_supported; i915->intel.vtbl.is_hiz_depth_format = i915_is_hiz_depth_format; - i915->intel.vtbl.hiz_resolve_depthbuffer = i915_hiz_resolve_noop; - i915->intel.vtbl.hiz_resolve_hizbuffer = i915_hiz_resolve_noop; } diff --git a/src/mesa/drivers/dri/i965/brw_vtbl.c b/src/mesa/drivers/dri/i965/brw_vtbl.c index 9302b276347..75e8b2645b6 100644 --- a/src/mesa/drivers/dri/i965/brw_vtbl.c +++ b/src/mesa/drivers/dri/i965/brw_vtbl.c @@ -218,12 +218,6 @@ static bool brw_is_hiz_depth_format(struct intel_context *intel, return intel->has_hiz && (format == MESA_FORMAT_X8_Z24); } -static void brw_hiz_resolve_noop(struct intel_context *intel, - struct intel_region *depth_region) -{ - /* empty */ -} - void brwInitVtbl( struct brw_context *brw ) { brw->intel.vtbl.check_vertex_size = 0; @@ -244,9 +238,6 @@ void brwInitVtbl( struct brw_context *brw ) if (brw->intel.has_hiz) { brw->intel.vtbl.hiz_resolve_hizbuffer = gen6_hiz_resolve_hizbuffer; brw->intel.vtbl.hiz_resolve_depthbuffer = gen6_hiz_resolve_depthbuffer; - } else { - brw->intel.vtbl.hiz_resolve_hizbuffer = brw_hiz_resolve_noop; - brw->intel.vtbl.hiz_resolve_depthbuffer = brw_hiz_resolve_noop; } if (brw->intel.gen >= 7) { -- cgit v1.2.3