From 95249b2d189de093ff4a19af3f27efe4ad3e82cd Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Mon, 30 Dec 2002 19:24:05 +0000
Subject: Check that ActiveTextureARB doesn't overflow MaxTextureUnits

---
 src/mesa/main/texstate.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 91e7ad96420..d234b176813 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -1,4 +1,4 @@
-/* $Id: texstate.c,v 1.89 2002/12/18 15:01:26 brianp Exp $ */
+/* $Id: texstate.c,v 1.90 2002/12/30 19:24:05 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -2427,7 +2427,8 @@ _mesa_ActiveTextureARB( GLenum target )
       _mesa_debug(ctx, "glActiveTexture %s\n",
                   _mesa_lookup_enum_by_nr(target));
 
-   if (texUnit > ctx->Const.MaxTextureUnits) {
+   /* Cater for texture unit 0 is first, therefore use >= */
+   if (texUnit >= ctx->Const.MaxTextureUnits) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glActiveTextureARB(target)");
       return;
    }
-- 
cgit v1.2.3