summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2006-02-28 15:48:19 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2006-02-28 15:48:19 +0000
commit34b60b001de080643aa5b7c9e0145b98b5653ed1 (patch)
tree8ef969397f617ed671a07c402392a2b2fe3bca8e /src/mesa
parent3073cf21d2ce13b96c79c4af5ed488ef46a172f9 (diff)
check if active fragment shader for deferred texturing/shading
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/swrast/s_span.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index 91556cae5f..0856b801ed 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);