projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0103d7a
)
swrast: check for single texture unit in _swrast_choose_triangle()
author
Brian Paul
<brianp@vmware.com>
Thu, 29 Oct 2009 01:41:24 +0000
(19:41 -0600)
committer
Brian Paul
<brianp@vmware.com>
Thu, 29 Oct 2009 01:41:24 +0000
(19:41 -0600)
src/mesa/swrast/s_triangle.c
patch
|
blob
|
history
diff --git
a/src/mesa/swrast/s_triangle.c
b/src/mesa/swrast/s_triangle.c
index fdd7314f3b3c1f297f09cc3375467e63bced344e..f417578d89900a4a099deb324e41e07418648154 100644
(file)
--- 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