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_setup | |
| 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_setup')
| -rw-r--r-- | src/mesa/swrast_setup/ss_vb.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/mesa/swrast_setup/ss_vb.c b/src/mesa/swrast_setup/ss_vb.c index 71a6b1f7cf..fa4993434a 100644 --- a/src/mesa/swrast_setup/ss_vb.c +++ b/src/mesa/swrast_setup/ss_vb.c @@ -1,10 +1,8 @@ -/* $Id: ss_vb.c,v 1.22 2002/10/29 20:29:00 brianp Exp $ */ - /* * Mesa 3-D graphics library - * Version: 4.1 + * Version: 5.1 * - * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -389,9 +387,9 @@ _swsetup_choose_rastersetup_func(GLcontext *ctx) if (ctx->Visual.rgbMode) { funcindex = COLOR; - if (ctx->Texture._EnabledUnits > 1) + if (ctx->Texture._EnabledCoordUnits > 1) funcindex |= MULTITEX; /* a unit above unit[0] is enabled */ - else if (ctx->Texture._EnabledUnits == 1) + else if (ctx->Texture._EnabledCoordUnits == 1) funcindex |= TEX0; /* only unit 0 is enabled */ if (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR) |