From: Brian Paul <brianp@vmware.com>
Date: Tue, 7 Apr 2009 13:04:14 +0000 (-0600)
Subject: swrast: restore !shader check around add_specular()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3e79d650835b3431464de876699d04702df99806;p=mesa.git

swrast: restore !shader check around add_specular()

Fixes a regression from commit 76ac75af8e5481b498981c133836efa2101be2dc.
---

diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index 07b39666037..cfff82b0513 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);
+         }
       }
    }