summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/Makefile.X113
-rw-r--r--src/mesa/main/config.h4
-rw-r--r--src/mesa/main/varray.c4
3 files changed, 7 insertions, 4 deletions
diff --git a/src/mesa/main/Makefile.X11 b/src/mesa/main/Makefile.X11
index 9ea476376da..d5ab089af1d 100644
--- a/src/mesa/main/Makefile.X11
+++ b/src/mesa/main/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.36 2000/12/26 05:09:27 keithw Exp $
+# $Id: Makefile.X11,v 1.37 2000/12/28 22:11:04 keithw Exp $
# Mesa 3-D graphics library
# Version: 3.5
@@ -160,6 +160,7 @@ DRIVER_SOURCES = \
FX/fxtexman.c \
FX/fxtris.c \
FX/fxvb.c \
+ FX/fxsimplerender.c \
FX/fxglidew.c \
X/glxapi.c \
X/fakeglx.c \
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index 1b3c4f0f271..fd2e1b599a6 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -1,4 +1,4 @@
-/* $Id: config.h,v 1.25 2000/12/26 05:09:28 keithw Exp $ */
+/* $Id: config.h,v 1.26 2000/12/28 22:11:05 keithw 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 4
+#define MAX_TEXTURE_UNITS 8
/* Maximum viewport/image size: */
#define MAX_WIDTH 2048
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 9fa20997cf9..0050d9a1a17 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -1,4 +1,4 @@
-/* $Id: varray.c,v 1.34 2000/12/26 05:09:29 keithw Exp $ */
+/* $Id: varray.c,v 1.35 2000/12/28 22:11:05 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -411,6 +411,8 @@ _mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr
ctx->NewState |= _NEW_ARRAY;
ctx->Array.NewState |= _NEW_ARRAY_VERTEX;
+/* fprintf(stderr, "%s ptr %p\n", __FUNCTION__, ptr); */
+
if (ctx->Driver.TexCoordPointer)
ctx->Driver.TexCoordPointer( ctx, size, type, stride, ptr );
}