diff options
author | Brian Paul <brianp@vmware.com> | 2009-04-07 07:04:14 -0600 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-04-07 07:04:14 -0600 |
commit | 3e79d650835b3431464de876699d04702df99806 (patch) | |
tree | b07faf40cd28af84fead5adc87adf88adfb4648d /src | |
parent | 799f43f2e01be8b3143c44fbd45485220174febd (diff) | |
download | external_mesa3d-3e79d650835b3431464de876699d04702df99806.zip external_mesa3d-3e79d650835b3431464de876699d04702df99806.tar.gz external_mesa3d-3e79d650835b3431464de876699d04702df99806.tar.bz2 |
swrast: restore !shader check around add_specular()
Fixes a regression from commit 76ac75af8e5481b498981c133836efa2101be2dc.
Diffstat (limited to 'src')
-rw-r--r-- | src/mesa/swrast/s_span.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c index 07b3966..cfff82b 100644 --- a/src/mesa/swrast/s_span.c +++ b/src/mesa/swrast/s_span.c @@ -1379,10 +1379,12 @@ _swrast_write_rgba_span( GLcontext *ctx, SWspan *span) if (span->primitive == GL_BITMAP || !swrast->SpecularVertexAdd) { /* Add primary and specular (diffuse + specular) colors */ - if (ctx->Fog.ColorSumEnabled || - (ctx->Light.Enabled && - ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)) { - add_specular(ctx, span); + if (!shader) { + if (ctx->Fog.ColorSumEnabled || + (ctx->Light.Enabled && + ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)) { + add_specular(ctx, span); + } } } |