diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-04-08 02:27:16 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-04-08 02:27:16 +0000 |
| commit | 36a0a3252e1e20df69b53f70ba93bc74c4a4bf0e (patch) | |
| tree | 6c680de320af7a288fe70e5a95696bcf0f5faa56 /src/mesa/swrast/s_lines.c | |
| parent | 0cebd5822a39ad3b3d7621f8e59efab329bfb5b9 (diff) | |
Added ctx->Texture._EnabledCoordUnits bitfield.
Fixed some vertex array / vertex program glitches with glDrawElements.
Fixed some fragment program runtime bugs.
Non-trivial Cg programs are running now.
Diffstat (limited to 'src/mesa/swrast/s_lines.c')
| -rw-r--r-- | src/mesa/swrast/s_lines.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/swrast/s_lines.c b/src/mesa/swrast/s_lines.c index c3c5c582f1..a9284d5029 100644 --- a/src/mesa/swrast/s_lines.c +++ b/src/mesa/swrast/s_lines.c @@ -1,5 +1,3 @@ -/* $Id: s_lines.c,v 1.36 2003/03/25 02:23:46 brianp Exp $ */ - /* * Mesa 3-D graphics library * Version: 5.1 @@ -305,9 +303,10 @@ _swrast_choose_line( GLcontext *ctx ) _swrast_choose_aa_line_function(ctx); ASSERT(swrast->Line); } - else if (ctx->Texture._EnabledUnits) { + else if (ctx->Texture._EnabledCoordUnits) { /* textured lines */ - if (ctx->Texture._EnabledUnits > 0x1 || (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR)) { + if (ctx->Texture._EnabledCoordUnits > 0x1 + || (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR)) { /* multi-texture and/or separate specular color */ USE(multitextured_line); } |