diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-01-09 10:08:06 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-01-09 10:08:06 +0000 |
| commit | e3734593aea202e99e77febea7b86c904080939f (patch) | |
| tree | 69856674e2062c55ec5eec95eb0e31225a943084 /src/mesa/main/attrib.c | |
| parent | 221352bbd79a0ea92ce31cffb65537f62ee5668e (diff) | |
| parent | 5cad143e545775acacee294049345c6a3868c51d (diff) | |
Merge commit 'origin/gallium-0.2' into gallium-xlib-rework
Conflicts:
progs/glsl/Makefile
Diffstat (limited to 'src/mesa/main/attrib.c')
| -rw-r--r-- | src/mesa/main/attrib.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index dc85da2518..825c841ee2 100644 --- a/src/mesa/main/attrib.c +++ b/src/mesa/main/attrib.c @@ -1,8 +1,9 @@ /* * Mesa 3-D graphics library - * Version: 7.2 + * Version: 7.3 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. + * Copyright (C) 2009 VMware, Inc. 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"), @@ -224,7 +225,7 @@ _mesa_PushAttrib(GLbitfield mask) attr->SampleAlphaToOne = ctx->Multisample.SampleAlphaToOne; attr->SampleCoverage = ctx->Multisample.SampleCoverage; attr->SampleCoverageInvert = ctx->Multisample.SampleCoverageInvert; - for (i=0; i<MAX_TEXTURE_UNITS; i++) { + for (i = 0; i < ctx->Const.MaxTextureUnits; i++) { attr->Texture[i] = ctx->Texture.Unit[i].Enabled; attr->TexGen[i] = ctx->Texture.Unit[i].TexGenEnabled; attr->TextureColorTable[i] = ctx->Texture.Unit[i].ColorTableEnabled; |