Mesa (master): mesa: added tex unit assert, use Elements() macro

[Brian Paul]

Module: Mesa
Branch: master
Commit: a32e7c487cbae1a8521fa2d244763e2ec596af91
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a32e7c487cbae1a8521fa2d244763e2ec596af91

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Feb  3 13:20:04 2010 -0700

mesa: added tex unit assert, use Elements() macro

---

 src/mesa/main/rastpos.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c
index 703b47e..be61dc2 100644
--- a/src/mesa/main/rastpos.c
+++ b/src/mesa/main/rastpos.c
@@ -273,6 +273,7 @@ window_pos3f(GLfloat x, GLfloat y, GLfloat z)
    {
       GLuint texSet;
       for (texSet = 0; texSet < ctx->Const.MaxTextureCoordUnits; texSet++) {
+         assert(texSet < Elements(ctx->Current.RasterTexCoords));
          COPY_4FV( ctx->Current.RasterTexCoords[texSet],
                   ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texSet] );
       }
@@ -562,7 +563,7 @@ void _mesa_init_rastpos( GLcontext * ctx )
    ASSIGN_4V( ctx->Current.RasterColor, 1.0, 1.0, 1.0, 1.0 );
    ASSIGN_4V( ctx->Current.RasterSecondaryColor, 0.0, 0.0, 0.0, 1.0 );
    ctx->Current.RasterIndex = 1.0;
-   for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++)
+   for (i = 0; i < Elements(ctx->Current.RasterTexCoords); i++)
       ASSIGN_4V( ctx->Current.RasterTexCoords[i], 0.0, 0.0, 0.0, 1.0 );
    ctx->Current.RasterPosValid = GL_TRUE;
 }