diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-12 15:21:19 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-12 15:21:19 +0000 |
| commit | e0058f158bae56c5a10cad4f9ace808a27022a9d (patch) | |
| tree | 0daf3e4bafd8a1c53f8228c41ffd1637c158bb29 /mesalib/src/mesa/tnl | |
| parent | b639ce1e238ac06882d504aca591ab62475459c1 (diff) | |
| parent | 77ec02adbc8f9657e7749b307d3cc86ccbd163ea (diff) | |
| download | vcxsrv-e0058f158bae56c5a10cad4f9ace808a27022a9d.tar.gz vcxsrv-e0058f158bae56c5a10cad4f9ace808a27022a9d.tar.bz2 vcxsrv-e0058f158bae56c5a10cad4f9ace808a27022a9d.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/tnl')
| -rw-r--r-- | mesalib/src/mesa/tnl/t_context.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesalib/src/mesa/tnl/t_context.c b/mesalib/src/mesa/tnl/t_context.c index f27f2d090..9faa54fdf 100644 --- a/mesalib/src/mesa/tnl/t_context.c +++ b/mesalib/src/mesa/tnl/t_context.c @@ -34,6 +34,7 @@ #include "main/light.h"
#include "math/m_translate.h"
#include "math/m_xform.h"
+#include "main/state.h"
#include "tnl.h"
#include "t_context.h"
@@ -127,7 +128,7 @@ _tnl_InvalidateState( struct gl_context *ctx, GLuint new_state ) RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_COLOR0 );
}
- if (NEED_SECONDARY_COLOR(ctx))
+ if (_mesa_need_secondary_color(ctx))
RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_COLOR1 );
for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) {
|