summaryrefslogtreecommitdiff
path: root/src/mesa/tnl/t_pipeline.c
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2000-11-20 18:06:11 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2000-11-20 18:06:11 +0000
commit189476f265e2acb69179420f0814b99dffc90b65 (patch)
treec8b7f5c32a9f4dcc66744d85b193caaf8e332382 /src/mesa/tnl/t_pipeline.c
parentce2733b7cc35d79082164afc1bb55c5f6861612e (diff)
minor multi-tex changes, changed MAX_TEXTURE_UNITS to 4
Diffstat (limited to 'src/mesa/tnl/t_pipeline.c')
-rw-r--r--src/mesa/tnl/t_pipeline.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/tnl/t_pipeline.c b/src/mesa/tnl/t_pipeline.c
index 03c93911b9..f323885422 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, " : "");