diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-03-14 15:40:59 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-03-14 15:40:59 +0000 |
| commit | f386f73f9e4054a750d453fa2f5449c2f1d2e242 (patch) | |
| tree | 5ced5cfb6cb7f5006cc67618dac6eb83bdf93e4d /src/mesa/swrast/s_triangle.c | |
| parent | a2da1155c285fde2a5e5824d50ee8a57c6e982f5 (diff) | |
Clean-up of parser error handling/reporting.
Basic fragment program texture instructions are limping along.
Diffstat (limited to 'src/mesa/swrast/s_triangle.c')
| -rw-r--r-- | src/mesa/swrast/s_triangle.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c index 76a45b96b5..538102f41f 100644 --- a/src/mesa/swrast/s_triangle.c +++ b/src/mesa/swrast/s_triangle.c @@ -1,4 +1,4 @@ -/* $Id: s_triangle.c,v 1.67 2003/03/01 01:50:26 brianp Exp $ */ +/* $Id: s_triangle.c,v 1.68 2003/03/14 15:41:00 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1066,6 +1066,7 @@ _swrast_choose_triangle( GLcontext *ctx ) /* First see if we can use an optimized 2-D texture function */ if (ctx->Texture._EnabledUnits == 1 + && !ctx->FragmentProgram.Enabled && ctx->Texture.Unit[0]._ReallyEnabled == TEXTURE_2D_BIT && texObj2D->WrapS==GL_REPEAT && texObj2D->WrapT==GL_REPEAT |