projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a79d4e7
)
fix problem when CHAN_BITS == 32 (bug 8704), remove unneeded assertion
author
Brian Paul
<brian.paul@tungstengraphics.com>
Thu, 19 Oct 2006 14:02:42 +0000
(14:02 +0000)
committer
Brian Paul
<brian.paul@tungstengraphics.com>
Thu, 19 Oct 2006 14:02:42 +0000
(14:02 +0000)
src/mesa/swrast/s_span.c
patch
|
blob
|
history
diff --git
a/src/mesa/swrast/s_span.c
b/src/mesa/swrast/s_span.c
index 4628fd0527f7373cde88fbb8cb19a6959a574106..973ef3e3e4dab27bda97ae71853391b3a998d1f2 100644
(file)
--- 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) {
GLuint i;
switch (span->array->ChanType) {
+#if CHAN_BITS != 32
case GL_UNSIGNED_BYTE:
{
GLubyte (*spec)[4] = span->array->color.sz1.spec;
case GL_UNSIGNED_BYTE:
{
GLubyte (*spec)[4] = span->array->color.sz1.spec;
@@
-348,6
+349,7
@@
interpolate_specular(SWspan *span)
}
}
break;
}
}
break;
+#endif
case GL_FLOAT:
{
GLfloat (*spec)[4] = span->array->color.sz4.spec;
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);
/* Interpolate texcoords? */
if (ctx->Texture._EnabledCoordUnits && (span->interpMask & SPAN_TEXTURE)) {
interpolate_texcoords(ctx, span);
- ASSERT(span->arrayMask & SPAN_TEXTURE);
}
if (ctx->ShaderObjects._FragmentShaderPresent) {
}
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);
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 ||
/* use float colors if running a fragment program or shader */
if (ctx->ShaderObjects._FragmentShaderPresent ||
ctx->FragmentProgram._Enabled ||