From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 10 Jun 2005 14:37:32 +0000 (+0000)
Subject: be sure we have span texcoords before calling _swrast_texture_span()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=252d8e78cc07880239b085b713e2d37ddbba86f9;p=mesa.git

be sure we have span texcoords before calling _swrast_texture_span()
---

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 );
    }