From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 6 Jun 2002 16:31:24 +0000 (+0000)
Subject: replaced hard-coded 4 with NUM_TEXTURE_TARGETS
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f21a4872e8218c0454107686a531eb0ff19c36bb;p=mesa.git

replaced hard-coded 4 with NUM_TEXTURE_TARGETS
---

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 2864e65b47d..cc6c40f7a23 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1,4 +1,4 @@
-/* $Id: mtypes.h,v 1.76 2002/05/27 17:04:53 brianp Exp $ */
+/* $Id: mtypes.h,v 1.77 2002/06/06 16:31:24 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -726,6 +726,8 @@ struct gl_stencil_attrib {
 #define R_BIT 4
 #define Q_BIT 8
 
+#define NUM_TEXTURE_TARGETS 4 /* 1D, 2D, 3D and CUBE */
+
 /* Texture Enabled flags */
 #define TEXTURE0_1D   0x1     /* Texture unit 0 (default) */
 #define TEXTURE0_2D   0x2
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index c513b4fccaf..d94c9c7337a 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -1,4 +1,4 @@
-/* $Id: state.c,v 1.83 2002/05/29 15:16:02 brianp Exp $ */
+/* $Id: state.c,v 1.84 2002/06/06 16:31:24 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -836,7 +836,7 @@ update_texture_state( GLcontext *ctx )
       }
 
       {
-	 GLuint flag = texUnit->_ReallyEnabled << (i * 4);
+	 GLuint flag = texUnit->_ReallyEnabled << (i * NUM_TEXTURE_TARGETS);
 	 ctx->Texture._ReallyEnabled |= flag;
       }