From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 28 Feb 2006 15:48:19 +0000 (+0000)
Subject: check if active fragment shader for deferred texturing/shading
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=34b60b001de080643aa5b7c9e0145b98b5653ed1;p=mesa.git

check if active fragment shader for deferred texturing/shading
---

diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index 91556cae5f3..0856b801ed2 100644
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -1084,7 +1084,8 @@ _swrast_write_rgba_span( GLcontext *ctx, struct sw_span *span)
    const GLbitfield origArrayMask = span->arrayMask;
    const GLboolean deferredTexture = !(ctx->Color.AlphaEnabled ||
                                        ctx->FragmentProgram._Active ||
-                                       ctx->ATIFragmentShader._Enabled);
+                                       ctx->ATIFragmentShader._Enabled ||
+                                       ctx->ShaderObjects.CurrentProgram);
 
    ASSERT(span->primitive == GL_POINT  ||  span->primitive == GL_LINE ||
 	  span->primitive == GL_POLYGON  ||  span->primitive == GL_BITMAP);