diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-10-19 14:02:42 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-10-19 14:02:42 +0000 |
| commit | c351858de8e51fa4a6425cf176cc43689189f3ff (patch) | |
| tree | 7daebcbfd43adbe891843dd8ed25b46cfbc0738d | |
| parent | a79d4e75c3f1da65a6f4d4d8d450ad96fa98767d (diff) | |
fix problem when CHAN_BITS == 32 (bug 8704), remove unneeded assertion
| -rw-r--r-- | src/mesa/swrast/s_span.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c index 4628fd0527..973ef3e3e4 100644 --- a/src/mesa/swrast/s_span.c +++ b/src/mesa/swrast/s_span.c @@ -284,6 +284,7 @@ interpolate_specular(SWspan *span) GLuint i; switch (span->array->ChanType) { +#if CHAN_BITS != 32 case GL_UNSIGNED_BYTE: { GLubyte (*spec)[4] = span->array->color.sz1.spec; @@ -348,6 +349,7 @@ interpolate_specular(SWspan *span) } } break; +#endif case GL_FLOAT: { GLfloat (*spec)[4] = span->array->color.sz4.spec; @@ -1390,7 +1392,6 @@ _swrast_write_rgba_span( GLcontext *ctx, SWspan *span) /* Interpolate texcoords? */ if (ctx->Texture._EnabledCoordUnits && (span->interpMask & SPAN_TEXTURE)) { interpolate_texcoords(ctx, span); - ASSERT(span->arrayMask & SPAN_TEXTURE); } if (ctx->ShaderObjects._FragmentShaderPresent) { @@ -1413,6 +1414,8 @@ _swrast_write_rgba_span( GLcontext *ctx, SWspan *span) if (span->interpMask & SPAN_FOG) interpolate_fog(ctx, span); + /* XXX need this code below too? */ + /* use float colors if running a fragment program or shader */ if (ctx->ShaderObjects._FragmentShaderPresent || ctx->FragmentProgram._Enabled || |