diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2002-07-09 01:22:50 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2002-07-09 01:22:50 +0000 |
| commit | 3b4fbbc129c711a5aec8d653d5c6eb2e195f947c (patch) | |
| tree | ececa2d3a08ab45afd2068d9cabf5609a0c374d1 /src/mesa/swrast/s_triangle.c | |
| parent | b4338e58879a4f2eabf8af09f9dfa7adf6e9f9f2 (diff) | |
Overhaul of glRead/DrawBuffer() code. Now, swrast->Driver.SetBuffer()
indicates the read AND draw color buffer for all software rasterization.
Lots of related clean-ups. See RELNOTES-4.1 for details.
Diffstat (limited to 'src/mesa/swrast/s_triangle.c')
| -rw-r--r-- | src/mesa/swrast/s_triangle.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c index bdbdde76b8..634664371b 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.59 2002/06/15 03:03:12 brianp Exp $ */ +/* $Id: s_triangle.c,v 1.60 2002/07/09 01:22:52 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -218,7 +218,7 @@ static void simple_textured_triangle( GLcontext *ctx, span->intTex[1] += span->intTexStep[1]; \ } \ (*swrast->Driver.WriteRGBSpan)(ctx, span->end, span->x, span->y, \ - (CONST GLchan (*)[3]) span->color.rgb, \ + (CONST GLchan (*)[3]) span->color.rgb,\ NULL ); #include "s_tritemp.h" @@ -283,7 +283,7 @@ static void simple_z_textured_triangle( GLcontext *ctx, span->z += span->zStep; \ } \ (*swrast->Driver.WriteRGBSpan)(ctx, span->end, span->x, span->y, \ - (CONST GLchan (*)[3]) span->color.rgb, \ + (CONST GLchan (*)[3]) span->color.rgb,\ span->mask ); #include "s_tritemp.h" @@ -589,7 +589,7 @@ static void affine_textured_triangle( GLcontext *ctx, info.format = obj->Image[b]->Format; \ info.filter = obj->MinFilter; \ info.envmode = unit->EnvMode; \ - span->arrayMask |= SPAN_RGBA; \ + span->arrayMask |= SPAN_RGBA; \ \ if (info.envmode == GL_BLEND) { \ /* potential off-by-one error here? (1.0f -> 2048 -> 0) */ \ @@ -896,7 +896,7 @@ static void persp_textured_triangle( GLcontext *ctx, #define RENDER_SPAN( span ) \ span->interpMask &= ~SPAN_RGBA; \ - span->arrayMask |= SPAN_RGBA; \ + span->arrayMask |= SPAN_RGBA; \ fast_persp_span(ctx, span, &info); #include "s_tritemp.h" @@ -976,7 +976,7 @@ static void occlusion_zless_triangle( GLcontext *ctx, #define RENDER_SPAN( span ) \ GLuint i; \ for (i = 0; i < span->end; i++) { \ - GLdepth z = FixedToDepth(span->z); \ + GLdepth z = FixedToDepth(span->z); \ if (z < zRow[i]) { \ ctx->OcclusionResult = GL_TRUE; \ return; \ |