diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2005-06-02 04:09:05 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2005-06-02 04:09:05 +0000 |
| commit | 3fe9c40cb27b23d44e938a19fbf4f21e1b1e288b (patch) | |
| tree | a282265070f1781be7a1427d1141d2dc02acc23e /src/mesa/swrast/s_triangle.c | |
| parent | 13c8f985d96fa7dda0fd71dc4f656ce01dcdbe85 (diff) | |
Remove last of the old span code.
Diffstat (limited to 'src/mesa/swrast/s_triangle.c')
| -rw-r--r-- | src/mesa/swrast/s_triangle.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c index 48ec2836e8..4b7e42b6ec 100644 --- a/src/mesa/swrast/s_triangle.c +++ b/src/mesa/swrast/s_triangle.c @@ -148,7 +148,6 @@ _swrast_culltriangle( GLcontext *ctx, #define T_SCALE theight #define SETUP_CODE \ - SWcontext *swrast = SWRAST_CONTEXT(ctx); \ struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[0][0];\ struct gl_texture_object *obj = ctx->Texture.Unit[0].Current2D; \ const GLint b = obj->BaseLevel; \ @@ -178,12 +177,7 @@ _swrast_culltriangle( GLcontext *ctx, span.intTex[0] += span.intTexStep[0]; \ span.intTex[1] += span.intTexStep[1]; \ } \ - if (swrast->Driver.WriteRGBSpan) \ - swrast->Driver.WriteRGBSpan(ctx, rb, span.end, span.x, span.y, \ - (CONST GLchan (*)[3]) span.array->rgb,\ - NULL ); \ - else \ - rb->PutRowRGB(ctx, rb, span.end, span.x, span.y, span.array->rgb, NULL); + rb->PutRowRGB(ctx, rb, span.end, span.x, span.y, span.array->rgb, NULL); #include "s_tritemp.h" @@ -205,7 +199,6 @@ _swrast_culltriangle( GLcontext *ctx, #define T_SCALE theight #define SETUP_CODE \ - SWcontext *swrast = SWRAST_CONTEXT(ctx); \ struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[0][0];\ struct gl_texture_object *obj = ctx->Texture.Unit[0].Current2D; \ const GLint b = obj->BaseLevel; \ @@ -244,12 +237,7 @@ _swrast_culltriangle( GLcontext *ctx, span.intTex[1] += span.intTexStep[1]; \ span.z += span.zStep; \ } \ - if (swrast->Driver.WriteRGBSpan) \ - swrast->Driver.WriteRGBSpan(ctx, rb, span.end, span.x, span.y, \ - (CONST GLchan (*)[3]) span.array->rgb,\ - span.array->mask ); \ - else \ - rb->PutRowRGB(ctx, rb, span.end, span.x, span.y, span.array->rgb, NULL); + rb->PutRowRGB(ctx, rb, span.end, span.x, span.y, span.array->rgb, NULL); #include "s_tritemp.h" |