From df410863d7c2377cfbabfef907fc318e10c5486e Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 19 Apr 2013 14:51:55 -0700 Subject: intel: Remove the last spans code! The remaining bits happen to do nothing that _swrast_span_render_start()/finish() don't do. Reviewed-by: Kenneth Graunke Reviewed-by: Brian Paul --- src/mesa/drivers/dri/i915/Makefile.sources | 1 - src/mesa/drivers/dri/i915/i830_context.c | 2 -- src/mesa/drivers/dri/i915/i915_context.c | 3 --- src/mesa/drivers/dri/i915/intel_tris.c | 13 ++++++------- 4 files changed, 6 insertions(+), 13 deletions(-) (limited to 'src/mesa/drivers/dri/i915') diff --git a/src/mesa/drivers/dri/i915/Makefile.sources b/src/mesa/drivers/dri/i915/Makefile.sources index b14e52c5da8..fff27b78f0e 100644 --- a/src/mesa/drivers/dri/i915/Makefile.sources +++ b/src/mesa/drivers/dri/i915/Makefile.sources @@ -40,7 +40,6 @@ i915_FILES = \ i915_vtbl.c \ intel_context.c \ intel_screen.c \ - intel_span.c \ intel_state.c \ intel_syncobj.c \ intel_tris.c \ diff --git a/src/mesa/drivers/dri/i915/i830_context.c b/src/mesa/drivers/dri/i915/i830_context.c index f4b35178493..072f8e02aab 100644 --- a/src/mesa/drivers/dri/i915/i830_context.c +++ b/src/mesa/drivers/dri/i915/i830_context.c @@ -34,7 +34,6 @@ #include "tnl/t_vertex.h" #include "tnl/t_context.h" #include "tnl/t_pipeline.h" -#include "intel_span.h" #include "intel_tris.h" #include "../glsl/ralloc.h" @@ -87,7 +86,6 @@ i830CreateContext(int api, _math_matrix_ctr(&intel->ViewportMatrix); /* Initialize swrast, tnl driver tables: */ - intelInitSpanFuncs(ctx); intelInitTriFuncs(ctx); /* Install the customized pipeline: */ diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c index 65b50ea6700..e5635372a09 100644 --- a/src/mesa/drivers/dri/i915/i915_context.c +++ b/src/mesa/drivers/dri/i915/i915_context.c @@ -44,8 +44,6 @@ #include "i915_reg.h" #include "i915_program.h" -#include "intel_span.h" - /*************************************** * Mesa's Driver Functions ***************************************/ @@ -183,7 +181,6 @@ i915CreateContext(int api, _math_matrix_ctr(&intel->ViewportMatrix); /* Initialize swrast, tnl driver tables: */ - intelInitSpanFuncs(ctx); intelInitTriFuncs(ctx); /* Install the customized pipeline: */ diff --git a/src/mesa/drivers/dri/i915/intel_tris.c b/src/mesa/drivers/dri/i915/intel_tris.c index 30eb6ac4434..7c60d8454fa 100644 --- a/src/mesa/drivers/dri/i915/intel_tris.c +++ b/src/mesa/drivers/dri/i915/intel_tris.c @@ -52,7 +52,6 @@ #include "intel_batchbuffer.h" #include "intel_buffers.h" #include "intel_reg.h" -#include "intel_span.h" #include "i830_context.h" #include "i830_reg.h" #include "i915_context.h" @@ -808,9 +807,9 @@ intel_fallback_tri(struct intel_context *intel, _swsetup_Translate(ctx, v0, &v[0]); _swsetup_Translate(ctx, v1, &v[1]); _swsetup_Translate(ctx, v2, &v[2]); - intelSpanRenderStart(ctx); + _swrast_render_start(ctx); _swrast_Triangle(ctx, &v[0], &v[1], &v[2]); - intelSpanRenderFinish(ctx); + _swrast_render_finish(ctx); } @@ -828,9 +827,9 @@ intel_fallback_line(struct intel_context *intel, _swsetup_Translate(ctx, v0, &v[0]); _swsetup_Translate(ctx, v1, &v[1]); - intelSpanRenderStart(ctx); + _swrast_render_start(ctx); _swrast_Line(ctx, &v[0], &v[1]); - intelSpanRenderFinish(ctx); + _swrast_render_finish(ctx); } static void @@ -846,9 +845,9 @@ intel_fallback_point(struct intel_context *intel, INTEL_FIREVERTICES(intel); _swsetup_Translate(ctx, v0, &v[0]); - intelSpanRenderStart(ctx); + _swrast_render_start(ctx); _swrast_Point(ctx, &v[0]); - intelSpanRenderFinish(ctx); + _swrast_render_finish(ctx); } -- cgit v1.2.3