From ee4e75bd6f768b7210436feeb32b4545ed62e025 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 14 Apr 2006 02:20:18 +0000
Subject: Replace ctx->Const.MaxTextureUnits w/
 ctx->Const.MaxTexture[Coord/Image]Units in various places. Note that
 ctx->Texture.CurrentUnit needs to be tested against Coord/Image limits when
 referenced, not just in glActiveTexture().

---
 src/mesa/main/matrix.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/mesa/main/matrix.c')

diff --git a/src/mesa/main/matrix.c b/src/mesa/main/matrix.c
index 5ff250a0c7..7339b0ce40 100644
--- a/src/mesa/main/matrix.c
+++ b/src/mesa/main/matrix.c
@@ -160,6 +160,10 @@ _mesa_MatrixMode( GLenum mode )
       ctx->CurrentStack = &ctx->ProjectionMatrixStack;
       break;
    case GL_TEXTURE:
+      if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) {
+         _mesa_error(ctx, GL_INVALID_OPERATION, "glMatrixMode(texcoord unit)");
+         return;
+      }
       ctx->CurrentStack = &ctx->TextureMatrixStack[ctx->Texture.CurrentUnit];
       break;
    case GL_COLOR:
-- 
cgit v1.2.3