Mesa (texformat-rework): swrast: check for single texture unit in _swrast_choose_triangle()

[Brian Paul]

Module: Mesa
Branch: texformat-rework
Commit: 88bb4b593576a2977b2fe36794bd4d3dbc72063e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=88bb4b593576a2977b2fe36794bd4d3dbc72063e

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Oct 28 19:41:24 2009 -0600

swrast: check for single texture unit in _swrast_choose_triangle()

---

 src/mesa/swrast/s_triangle.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c
index fdd7314..f417578 100644
--- a/src/mesa/swrast/s_triangle.c
+++ b/src/mesa/swrast/s_triangle.c
@@ -1066,6 +1066,7 @@ _swrast_choose_triangle( GLcontext *ctx )
          if (ctx->Texture._EnabledCoordUnits == 0x1
              && !ctx->FragmentProgram._Current
              && !ctx->ATIFragmentShader._Enabled
+             && ctx->Texture._EnabledUnits == 0x1
              && ctx->Texture.Unit[0]._ReallyEnabled == TEXTURE_2D_BIT
              && texObj2D->WrapS == GL_REPEAT
              && texObj2D->WrapT == GL_REPEAT