summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2005-06-10 14:37:32 +0000
committerBrian Paul <[email protected]>2005-06-10 14:37:32 +0000
commit252d8e78cc07880239b085b713e2d37ddbba86f9 (patch)
tree93f3521abacf80db31ac2736d9aafd38dd9ab8f4 /src/mesa
parent5d6ecf25f89b152638f68ba683611f73c51b52a4 (diff)
be sure we have span texcoords before calling _swrast_texture_span()
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/swrast/s_span.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index bb16a8938b6..86ae136562b 100644
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -1183,7 +1183,7 @@ _swrast_write_rgba_span( GLcontext *ctx, struct sw_span *span)
_swrast_exec_fragment_program( ctx, span );
else if (ctx->ATIFragmentShader._Enabled)
_swrast_exec_fragment_shader( ctx, span );
- else if (ctx->Texture._EnabledUnits)
+ else if (ctx->Texture._EnabledUnits && (span->arrayMask & SPAN_TEXTURE))
_swrast_texture_span( ctx, span );
/* Do the alpha test */
@@ -1260,7 +1260,7 @@ _swrast_write_rgba_span( GLcontext *ctx, struct sw_span *span)
_swrast_exec_fragment_program( ctx, span );
else if (ctx->ATIFragmentShader._Enabled)
_swrast_exec_fragment_shader( ctx, span );
- else if (ctx->Texture._EnabledUnits)
+ else if (ctx->Texture._EnabledUnits && (span->arrayMask & SPAN_TEXTURE))
_swrast_texture_span( ctx, span );
}