From f595212336ae63c981f0f39f4ea1dec67ff7fe25 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 2 May 2002 00:59:20 +0000 Subject: Implemented GL_ARB_texture_env_crossbar. Simplification of some of the texture application code. --- src/mesa/swrast/s_span.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mesa/swrast/s_span.c') diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c index 9712efb919..1e3c710b8a 100644 --- a/src/mesa/swrast/s_span.c +++ b/src/mesa/swrast/s_span.c @@ -1,4 +1,4 @@ -/* $Id: s_span.c,v 1.41 2002/04/20 17:54:55 brianp Exp $ */ +/* $Id: s_span.c,v 1.42 2002/05/02 00:59:20 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1171,7 +1171,7 @@ _mesa_write_texture_span( GLcontext *ctx, struct sw_span *span) /* Texturing without alpha is done after depth-testing which * gives a potential speed-up. */ - _swrast_multitexture_fragments( ctx, span ); + _swrast_texture_span( ctx, span ); /* Do the alpha test */ if (!_mesa_alpha_test(ctx, span)) { @@ -1220,7 +1220,7 @@ _mesa_write_texture_span( GLcontext *ctx, struct sw_span *span) if ((span->interpMask & SPAN_RGBA) && (span->arrayMask & SPAN_RGBA) == 0) interpolate_colors(ctx, span); - _swrast_multitexture_fragments( ctx, span ); + _swrast_texture_span( ctx, span ); } ASSERT(span->arrayMask & SPAN_RGBA); -- cgit v1.2.3