summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2009-10-28 19:41:24 -0600
committerBrian Paul <[email protected]>2009-10-28 19:41:24 -0600
commit88bb4b593576a2977b2fe36794bd4d3dbc72063e (patch)
treed4b875e4fa89ae34f2d800747babf478f287df24 /src/mesa
parent0103d7a47a6f42d8bb7199b5bd55097e3b0b92a4 (diff)
swrast: check for single texture unit in _swrast_choose_triangle()
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/swrast/s_triangle.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c
index fdd7314f3b3..f417578d899 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