diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2002-01-16 16:00:03 +0000 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2002-01-16 16:00:03 +0000 |
commit | 78940758e90069ceaca2b6cddb6438488fbad5cc (patch) | |
tree | 432ae3d78959a1ca693f9e48db2a7eba0817c515 /src/mesa/swrast/s_triangle.c | |
parent | b311950dde6fb7e59cc1742a848e7e3e4a8d73bf (diff) |
latest changes from Klaus
Diffstat (limited to 'src/mesa/swrast/s_triangle.c')
-rw-r--r-- | src/mesa/swrast/s_triangle.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c index d61a2bb659..f4c1643d6b 100644 --- a/src/mesa/swrast/s_triangle.c +++ b/src/mesa/swrast/s_triangle.c @@ -1,4 +1,4 @@ -/* $Id: s_triangle.c,v 1.46 2002/01/09 00:27:49 brianp Exp $ */ +/* $Id: s_triangle.c,v 1.47 2002/01/16 16:00:04 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -959,15 +959,8 @@ static void general_textured_triangle( GLcontext *ctx, span.tex[0][2] += span.texStep[0][2]; \ span.tex[0][3] += span.texStep[0][3]; \ } \ - _old_write_texture_span( ctx, span.end, span.x, span.y, \ - span.depth, fogSpan, \ - span.texcoords[0], \ - NULL, span.color.rgba, NULL, NULL, GL_POLYGON ); - -#define CLEANUP_CODE \ - UNDEFARRAY(sSpan); /* mac 32k limitation */ \ - UNDEFARRAY(tSpan); \ - UNDEFARRAY(uSpan); + _mesa_write_texture_span( ctx, &span, fogSpan, \ + GL_POLYGON ); #include "s_tritemp.h" } |