From 189476f265e2acb69179420f0814b99dffc90b65 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 20 Nov 2000 18:06:11 +0000
Subject: [PATCH] minor multi-tex changes, changed MAX_TEXTURE_UNITS to 4

---
 src/mesa/main/config.h    | 4 ++--
 src/mesa/tnl/t_pipeline.c | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index f727c14..95365d9 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -1,4 +1,4 @@
-/* $Id: config.h,v 1.23 2000/10/29 18:23:16 brianp Exp $ */
+/* $Id: config.h,v 1.24 2000/11/20 18:06:11 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -103,7 +103,7 @@
 #define MAX_TEXTURE_LEVELS 12
 
 /* Number of texture units - GL_ARB_multitexture */
-#define MAX_TEXTURE_UNITS 3
+#define MAX_TEXTURE_UNITS 4
 
 /* Maximum viewport/image size: */
 #define MAX_WIDTH 2048
diff --git a/src/mesa/tnl/t_pipeline.c b/src/mesa/tnl/t_pipeline.c
index 03c9391..f323885 100644
--- a/src/mesa/tnl/t_pipeline.c
+++ b/src/mesa/tnl/t_pipeline.c
@@ -1,4 +1,4 @@
-/* $Id: t_pipeline.c,v 1.1 2000/11/16 21:05:42 keithw Exp $ */
+/* $Id: t_pipeline.c,v 1.2 2000/11/20 18:06:13 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -58,7 +58,7 @@
 void gl_print_pipe_ops( const char *msg, GLuint flags )
 {
    fprintf(stderr, 
-	   "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s\n",
+	   "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s\n",
 	   msg,
 	   flags,
 	   (flags & PIPE_OP_CVA_PREPARE)   ? "cva-prepare, " : "",
@@ -68,6 +68,8 @@ void gl_print_pipe_ops( const char *msg, GLuint flags )
 	   (flags & PIPE_OP_FOG)           ? "fog, " : "",
 	   (flags & PIPE_OP_TEX0)          ? "tex-0, " : "",
 	   (flags & PIPE_OP_TEX1)          ? "tex-1, " : "",
+	   (flags & PIPE_OP_TEX2)          ? "tex-2, " : "",
+	   (flags & PIPE_OP_TEX3)          ? "tex-3, " : "",
 	   (flags & PIPE_OP_RAST_SETUP_0)  ? "rast-0, " : "",
 	   (flags & PIPE_OP_RAST_SETUP_1)  ? "rast-1, " : "",
 	   (flags & PIPE_OP_RENDER)        ? "render, " : "");
-- 
2.7.4