Fix recent build breakage.

11 files changed, 306 insertions, 80 deletions

diff --git a/xc/lib/GL/mesa/Imakefile b/xc/lib/GL/mesa/Imakefile
index 72698e6e3..deb1b4c4a 100644
--- a/xc/lib/GL/mesa/Imakefile
+++ b/xc/lib/GL/mesa/Imakefile
@@ -58,7 +58,7 @@ LibraryObjectRule()
 #define IHaveSubdirs
 #define PassCDebugFlags
 
-SUBDIRS = $(ASM_SUBDIRS) array_cache main math swrast swrast_setup tnl tnl_dd
+SUBDIRS = $(ASM_SUBDIRS) array_cache main math swrast swrast_setup tnl tnl_dd shader
 
 
 MakeSubdirs($(SUBDIRS))
diff --git a/xc/lib/GL/mesa/Imakefile.inc b/xc/lib/GL/mesa/Imakefile.inc
index 8afabfa6a..d072b2ef9 100644
--- a/xc/lib/GL/mesa/Imakefile.inc
+++ b/xc/lib/GL/mesa/Imakefile.inc
@@ -11,32 +11,37 @@ COREMESASRCS = $(COREMESABASESRCS) \
 		$(MESA_MATH_SRCS) \
 		$(MESA_SWRAST_SRCS) \
 		$(MESA_SWR_SETUP_SRCS) \
-		$(MESA_TNL_SRCS)
+		$(MESA_TNL_SRCS) \
+		$(MESA_SHADER_SRCS)
 
 COREMESAOBJS = $(COREMESABASEOBJS) \
 		$(MESA_AC_OBJS) \
 		$(MESA_MATH_OBJS) \
 		$(MESA_SWRAST_OBJS) \
 		$(MESA_SWR_SETUP_OBJS) \
-		$(MESA_TNL_OBJS)
+		$(MESA_TNL_OBJS) \
+		$(MESA_SHADER_OBJS)
 
 COREMESAUOBJS = $(COREMESABASEUOBJS) \
 		$(MESA_AC_UOBJS) \
 		$(MESA_MATH_UOBJS) \
 		$(MESA_SWRAST_UOBJS) \
 		$(MESA_SWR_SETUP_UOBJS) \
-		$(MESA_TNL_UOBJS)
+		$(MESA_TNL_UOBJS) \
+		$(MESA_SHADER_UOBJS)
 
 COREMESADOBJS = $(COREMESABASEDOBJS) \
 		$(MESA_AC_DOBJS) \
 		$(MESA_MATH_DOBJS) \
 		$(MESA_SWRAST_DOBJS) \
 		$(MESA_SWR_SETUP_DOBJS) \
-		$(MESA_TNL_DOBJS)
+		$(MESA_TNL_DOBJS) \
+		$(MESA_SHADER_DOBJS)
 
 COREMESAPOBJS = $(COREMESABASEPOBJS) \
 		$(MESA_AC_POBJS) \
 		$(MESA_MATH_POBJS) \
 		$(MESA_SWRAST_POBJS) \
 		$(MESA_SWR_SETUP_POBJS) \
-		$(MESA_TNL_POBJS)
+		$(MESA_TNL_POBJS) \
+		$(MESA_SHADER_POBJS)
diff --git a/xc/lib/GL/mesa/main/Imakefile b/xc/lib/GL/mesa/main/Imakefile
index f0dcdb4b3..213ad67e2 100644
--- a/xc/lib/GL/mesa/main/Imakefile
+++ b/xc/lib/GL/mesa/main/Imakefile
@@ -43,6 +43,7 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
      INCLUDES = /*-I$(INCLUDESRC) -I$(EXTINCSRC) */ -I$(XINCLUDESRC) \
 		-I$(MESASRCDIR)/src/mesa/glapi \
 		-I$(MESASRCDIR)/src/mesa/math \
+		-I$(MESASRCDIR)/src/mesa/shader \
 		-I$(MESASRCDIR)/src/mesa/main \
 		-I$(MESASRCDIR)/src/mesa -I$(GLXLIBSRC)/dri \
 		-I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include
diff --git a/xc/lib/GL/mesa/main/Imakefile.inc b/xc/lib/GL/mesa/main/Imakefile.inc
index c22585711..eda2699d9 100644
--- a/xc/lib/GL/mesa/main/Imakefile.inc
+++ b/xc/lib/GL/mesa/main/Imakefile.inc
@@ -13,7 +13,7 @@ MESABUILDDIR = MesaBuildDir
 #endif
 
 MESA_CORE_INCLUDES = -I$(MESASRCDIR)/src/array_cache \
-                -I$(MESASRCDIR)/src/math \
+                -I$(MESASRCDIR)/src/math -I$(MESASRCDIR)/src/shader \
                 -I$(MESASRCDIR)/src/swrast -I$(MESASRCDIR)/src/swrast_setup \
                 -I$(MESASRCDIR)/src/tnl -I$(MESASRCDIR)/src/tnl_dd
 
@@ -23,10 +23,6 @@ COREMESABASESRCS = \
 		$(MESABUILDDIR)api_noop.c \
 		$(MESABUILDDIR)api_validate.c \
 		$(MESABUILDDIR)accum.c \
-		$(MESABUILDDIR)arbparse.c \
-		$(MESABUILDDIR)arbprogram.c \
-		$(MESABUILDDIR)arbfragparse.c \
-		$(MESABUILDDIR)arbvertparse.c \
 		$(MESABUILDDIR)attrib.c \
 		$(MESABUILDDIR)blend.c \
 		$(MESABUILDDIR)bufferobj.c \
@@ -54,15 +50,10 @@ COREMESABASESRCS = \
 		$(MESABUILDDIR)light.c \
 		$(MESABUILDDIR)lines.c \
 		$(MESABUILDDIR)matrix.c \
-		$(MESABUILDDIR)nvprogram.c \
-		$(MESABUILDDIR)nvfragparse.c \
-		$(MESABUILDDIR)nvvertexec.c \
-		$(MESABUILDDIR)nvvertparse.c \
 		$(MESABUILDDIR)occlude.c \
 		$(MESABUILDDIR)pixel.c \
 		$(MESABUILDDIR)points.c \
 		$(MESABUILDDIR)polygon.c \
-		$(MESABUILDDIR)program.c \
 		$(MESABUILDDIR)rastpos.c \
 		$(MESABUILDDIR)state.c \
 		$(MESABUILDDIR)stencil.c \
@@ -88,15 +79,6 @@ LinkSourceFile(api_validate.c, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(api_validate.h, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(accum.c, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(accum.h, $(MESASRCDIR)/src/mesa/main)
-LinkSourceFile(arbparse.c, $(MESASRCDIR)/src/mesa/main)
-LinkSourceFile(arbprogram.c, $(MESASRCDIR)/src/mesa/main)
-LinkSourceFile(arbfragparse.c, $(MESASRCDIR)/src/mesa/main)
-LinkSourceFile(arbfragparse.h, $(MESASRCDIR)/src/mesa/main)
-LinkSourceFile(arbparse.h, $(MESASRCDIR)/src/mesa/main)
-LinkSourceFile(arbparse_syn.h, $(MESASRCDIR)/src/mesa/main)
-LinkSourceFile(arbprogram.h, $(MESASRCDIR)/src/mesa/main)
-LinkSourceFile(arbvertparse.c, $(MESASRCDIR)/src/mesa/main)
-LinkSourceFile(arbvertparse.h, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(attrib.c, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(attrib.h, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(blend.c, $(MESASRCDIR)/src/mesa/main)
@@ -164,16 +146,6 @@ LinkSourceFile(macros.h, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(matrix.c, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(matrix.h, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(mtypes.h, $(MESASRCDIR)/src/mesa/main)
-LinkSourceFile(nvfragparse.h, $(MESASRCDIR)/src/mesa/main)
-LinkSourceFile(nvfragprog.h, $(MESASRCDIR)/src/mesa/main)
-LinkSourceFile(nvprogram.c, $(MESASRCDIR)/src/mesa/main)
-LinkSourceFile(nvprogram.h, $(MESASRCDIR)/src/mesa/main)
-LinkSourceFile(nvfragparse.c, $(MESASRCDIR)/src/mesa/main)
-LinkSourceFile(nvvertexec.c, $(MESASRCDIR)/src/mesa/main)
-LinkSourceFile(nvvertexec.h, $(MESASRCDIR)/src/mesa/main)
-LinkSourceFile(nvvertparse.c, $(MESASRCDIR)/src/mesa/main)
-LinkSourceFile(nvvertparse.h, $(MESASRCDIR)/src/mesa/main)
-LinkSourceFile(nvvertprog.h, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(occlude.c, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(occlude.h, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(pixel.c, $(MESASRCDIR)/src/mesa/main)
@@ -182,8 +154,6 @@ LinkSourceFile(points.c, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(points.h, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(polygon.c, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(polygon.h, $(MESASRCDIR)/src/mesa/main)
-LinkSourceFile(program.c, $(MESASRCDIR)/src/mesa/main)
-LinkSourceFile(program.h, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(rastpos.c, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(rastpos.h, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(simple_list.h, $(MESASRCDIR)/src/mesa/main)
@@ -230,10 +200,6 @@ COREMESABASEOBJS = \
 		$(MESABUILDDIR)api_noop.o \
 		$(MESABUILDDIR)api_validate.o \
 		$(MESABUILDDIR)accum.o \
-		$(MESABUILDDIR)arbparse.o \
-		$(MESABUILDDIR)arbprogram.o \
-		$(MESABUILDDIR)arbfragparse.o \
-		$(MESABUILDDIR)arbvertparse.o \
 		$(MESABUILDDIR)attrib.o \
 		$(MESABUILDDIR)blend.o \
 		$(MESABUILDDIR)bufferobj.o \
@@ -261,15 +227,10 @@ COREMESABASEOBJS = \
 		$(MESABUILDDIR)light.o \
 		$(MESABUILDDIR)lines.o \
 		$(MESABUILDDIR)matrix.o \
-		$(MESABUILDDIR)nvprogram.o \
-		$(MESABUILDDIR)nvfragparse.o \
-		$(MESABUILDDIR)nvvertexec.o \
-		$(MESABUILDDIR)nvvertparse.o \
 		$(MESABUILDDIR)occlude.o \
 		$(MESABUILDDIR)pixel.o \
 		$(MESABUILDDIR)points.o \
 		$(MESABUILDDIR)polygon.o \
-		$(MESABUILDDIR)program.o \
 		$(MESABUILDDIR)rastpos.o \
 		$(MESABUILDDIR)state.o \
 		$(MESABUILDDIR)stencil.o \
@@ -299,10 +260,6 @@ COREMESABASEUOBJS = \
 		$(MESABUILDDIR)unshared/api_noop.o \
 		$(MESABUILDDIR)unshared/api_validate.o \
 		$(MESABUILDDIR)unshared/accum.o \
-		$(MESABUILDDIR)unshared/arbparse.o \
-		$(MESABUILDDIR)unshared/arbprogram.o \
-		$(MESABUILDDIR)unshared/arbfragparse.o \
-		$(MESABUILDDIR)unshared/arbvertparse.o \
 		$(MESABUILDDIR)unshared/attrib.o \
 		$(MESABUILDDIR)unshared/blend.o \
 		$(MESABUILDDIR)unshared/bufferobj.o \
@@ -330,15 +287,10 @@ COREMESABASEUOBJS = \
 		$(MESABUILDDIR)unshared/light.o \
 		$(MESABUILDDIR)unshared/lines.o \
 		$(MESABUILDDIR)unshared/matrix.o \
-		$(MESABUILDDIR)unshared/nvprogram.o \
-		$(MESABUILDDIR)unshared/nvfragparse.o \
-		$(MESABUILDDIR)unshared/nvvertexec.o \
-		$(MESABUILDDIR)unshared/nvvertparse.o \
 		$(MESABUILDDIR)unshared/occlude.o \
 		$(MESABUILDDIR)unshared/pixel.o \
 		$(MESABUILDDIR)unshared/points.o \
 		$(MESABUILDDIR)unshared/polygon.o \
-		$(MESABUILDDIR)unshared/program.o \
 		$(MESABUILDDIR)unshared/rastpos.o \
 		$(MESABUILDDIR)unshared/state.o \
 		$(MESABUILDDIR)unshared/stencil.o \
@@ -370,10 +322,6 @@ COREMESABASEDOBJS = \
 		$(MESABUILDDIR)debugger/api_noop.o \
 		$(MESABUILDDIR)debugger/api_validate.o \
 		$(MESABUILDDIR)debugger/accum.o \
-		$(MESABUILDDIR)debugger/arbparse.o \
-		$(MESABUILDDIR)debugger/arbprogram.o \
-		$(MESABUILDDIR)debugger/arbfragparse.o \
-		$(MESABUILDDIR)debugger/arbvertparse.o \
 		$(MESABUILDDIR)debugger/attrib.o \
 		$(MESABUILDDIR)debugger/blend.o \
 		$(MESABUILDDIR)debugger/bufferobj.o \
@@ -401,15 +349,10 @@ COREMESABASEDOBJS = \
 		$(MESABUILDDIR)debugger/light.o \
 		$(MESABUILDDIR)debugger/lines.o \
 		$(MESABUILDDIR)debugger/matrix.o \
-		$(MESABUILDDIR)debugger/nvprogram.o \
-		$(MESABUILDDIR)debugger/nvfragparse.o \
-		$(MESABUILDDIR)debugger/nvvertexec.o \
-		$(MESABUILDDIR)debugger/nvvertparse.o \
 		$(MESABUILDDIR)debugger/occlude.o \
 		$(MESABUILDDIR)debugger/pixel.o \
 		$(MESABUILDDIR)debugger/points.o \
 		$(MESABUILDDIR)debugger/polygon.o \
-		$(MESABUILDDIR)debugger/program.o \
 		$(MESABUILDDIR)debugger/rastpos.o \
 		$(MESABUILDDIR)debugger/state.o \
 		$(MESABUILDDIR)debugger/stencil.o \
@@ -438,10 +381,6 @@ COREMESABASEPOBJS = \
 		$(MESABUILDDIR)profiled/api_noop.o \
 		$(MESABUILDDIR)profiled/api_validate.o \
 		$(MESABUILDDIR)profiled/accum.o \
-		$(MESABUILDDIR)profiled/arbparse.o \
-		$(MESABUILDDIR)profiled/arbprogram.o \
-		$(MESABUILDDIR)profiled/arbfragparse.o \
-		$(MESABUILDDIR)profiled/arbvertparse.o \
 		$(MESABUILDDIR)profiled/attrib.o \
 		$(MESABUILDDIR)profiled/blend.o \
 		$(MESABUILDDIR)profiled/bufferobj.o \
@@ -469,15 +408,10 @@ COREMESABASEPOBJS = \
 		$(MESABUILDDIR)profiled/light.o \
 		$(MESABUILDDIR)profiled/lines.o \
 		$(MESABUILDDIR)profiled/matrix.o \
-		$(MESABUILDDIR)profiled/nvprogram.o \
-		$(MESABUILDDIR)profiled/nvfragparse.o \
-		$(MESABUILDDIR)profiled/nvvertexec.o \
-		$(MESABUILDDIR)profiled/nvvertparse.o \
 		$(MESABUILDDIR)profiled/occlude.o \
 		$(MESABUILDDIR)profiled/pixel.o \
 		$(MESABUILDDIR)profiled/points.o \
 		$(MESABUILDDIR)profiled/polygon.o \
-		$(MESABUILDDIR)profiled/program.o \
 		$(MESABUILDDIR)profiled/rastpos.o \
 		$(MESABUILDDIR)profiled/state.o \
 		$(MESABUILDDIR)profiled/stencil.o \
diff --git a/xc/lib/GL/mesa/shader/Imakefile b/xc/lib/GL/mesa/shader/Imakefile
new file mode 100644
index 000000000..c0333c02a
--- /dev/null
+++ b/xc/lib/GL/mesa/shader/Imakefile
@@ -0,0 +1,93 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/math/Imakefile,v 1.8 2002/11/25 12:58:55 tsi Exp $
+
+#include <Threads.tmpl>
+
+/*
+ * Need both shared and unshared Mesa objects in the following cases:
+ *   GlxDriverUsesMesa
+ *   GlxBuiltInXMesa
+ *   BuildOSMesaLib
+ *
+ * In other cases, only the shared version is needed to link in to loadable
+ * driver modules.
+ */
+
+#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtraLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+
+#define MesaMathBuildDir /**/
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines
+ DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
+		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
+#endif
+
+#if defined(i386Architecture) && MesaUseX86Asm
+      ASM_DIR = x86
+     ASM_SRCS =
+     ASM_OBJS =
+#if MesaUseMMX
+     MMX_DEFS = -DUSE_MMX_ASM
+#endif
+#if MesaUse3DNow
+   3DNOW_DEFS = -DUSE_3DNOW_ASM
+#endif
+#if MesaUseSSE
+     SSE_DEFS = -DUSE_SSE_ASM
+#endif
+     ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
+#endif
+
+#ifdef SparcArchitecture
+      ASM_DIR = sparc
+     ASM_SRCS =
+     ASM_OBJS =
+     ASM_DEFS = -DUSE_SPARC_ASM
+#endif
+
+#ifdef UseCompaqMathLibrary
+      MATHDEF = -DCCPML
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/math \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
+		-I$(MESASRCDIR)/include \
+		-I../../../include -I$(XINCLUDESRC)
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
+     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
+         SRCS = $(MESA_MATH_SRCS)
+         OBJS = $(MESA_MATH_OBJS)
+
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(OBJS))
+NormalLintTarget($(SRCS))
+
+DependTarget()
diff --git a/xc/lib/GL/mesa/shader/Imakefile.inc b/xc/lib/GL/mesa/shader/Imakefile.inc
new file mode 100644
index 000000000..ef76bad09
--- /dev/null
+++ b/xc/lib/GL/mesa/shader/Imakefile.inc
@@ -0,0 +1,95 @@
+XCOMM $XFree86:$
+
+#ifndef MesaShaderBuildDir
+#define MesaShaderBuildDir $(GLXLIBSRC)/mesa/shader/
+#endif
+
+MESASHADERBUILDDIR = MesaShaderBuildDir
+
+  MESA_SHADER_SRCS =	$(MESABUILDDIR)arbprogparse.c \
+			$(MESABUILDDIR)arbprogram.c \
+			$(MESABUILDDIR)arbfragparse.c \
+			$(MESABUILDDIR)arbvertparse.c \
+			$(MESABUILDDIR)grammar_mesa.c \
+			$(MESABUILDDIR)nvprogram.c \
+			$(MESABUILDDIR)nvfragparse.c \
+			$(MESABUILDDIR)nvvertexec.c \
+			$(MESABUILDDIR)nvvertparse.c \
+			$(MESABUILDDIR)program.c
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(arbprogparse.c, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(arbprogram.c, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(arbfragparse.c, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(arbvertparse.c, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(arbfragparse.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(arbprogparse.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(arbprogram.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(arbprogram_syn.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(arbvertparse.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(nvfragparse.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(nvfragprog.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(nvprogram.c, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(nvprogram.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(nvfragparse.c, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(nvvertexec.c, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(nvvertexec.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(nvvertparse.c, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(nvvertparse.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(nvvertprog.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(grammar.c, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(grammar_mesa.c, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(grammar.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(grammar_mesa.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(grammar_syn.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(program.c, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(program.h, $(MESASRCDIR)/src/mesa/shader)
+#endif
+
+  MESA_SHADER_OBJS =	$(MESASHADERBUILDDIR)arbprogparse.o \
+			$(MESASHADERBUILDDIR)arbprogram.o \
+			$(MESASHADERBUILDDIR)arbfragparse.o \
+			$(MESASHADERBUILDDIR)arbvertparse.o \
+			$(MESASHADERBUILDDIR)grammar_mesa.o \
+			$(MESASHADERBUILDDIR)nvprogram.o \
+			$(MESASHADERBUILDDIR)nvfragparse.o \
+			$(MESASHADERBUILDDIR)nvvertexec.o \
+			$(MESASHADERBUILDDIR)nvvertparse.o \
+			$(MESASHADERBUILDDIR)program.o
+
+#if defined(DoSharedLib) && DoSharedLib
+  MESA_SHADER_UOBJS =	$(MESASHADERBUILDDIR)unshared/arbprogparse.o \
+			$(MESASHADERBUILDDIR)unshared/arbprogram.o \
+			$(MESASHADERBUILDDIR)unshared/arbfragparse.o \
+			$(MESASHADERBUILDDIR)unshared/arbvertparse.o \
+			$(MESASHADERBUILDDIR)unshared/grammar_mesa.o \
+			$(MESASHADERBUILDDIR)unshared/nvprogram.o \
+			$(MESASHADERBUILDDIR)unshared/nvfragparse.o \
+			$(MESASHADERBUILDDIR)unshared/nvvertexec.o \
+			$(MESASHADERBUILDDIR)unshared/nvvertparse.o \
+			$(MESASHADERBUILDDIR)unshared/program.o
+#else
+ MATH_SHADER_UOBJS = $(MESA_SHADER_OBJS)
+#endif
+
+  MESA_SHADER_DOBJS =	$(MESASHADERBUILDDIR)debugger/arbprogparse.o \
+			$(MESASHADERBUILDDIR)debugger/arbprogram.o \
+			$(MESASHADERBUILDDIR)debugger/arbfragparse.o \
+			$(MESASHADERBUILDDIR)debugger/arbvertparse.o \
+			$(MESASHADERBUILDDIR)debugger/grammar_mesa.o \
+			$(MESASHADERBUILDDIR)debugger/nvprogram.o \
+			$(MESASHADERBUILDDIR)debugger/nvfragparse.o \
+			$(MESASHADERBUILDDIR)debugger/nvvertexec.o \
+			$(MESASHADERBUILDDIR)debugger/nvvertparse.o \
+			$(MESASHADERBUILDDIR)debugger/program.o
+
+  MESA_SHADER_POBJS =	$(MESASHADERBUILDDIR)profiled/arbprogparse.o \
+			$(MESASHADERBUILDDIR)profiled/arbprogram.o \
+			$(MESASHADERBUILDDIR)profiled/arbfragparse.o \
+			$(MESASHADERBUILDDIR)profiled/arbvertparse.o \
+			$(MESASHADERBUILDDIR)profiled/grammar_mesa.o \
+			$(MESASHADERBUILDDIR)profiled/nvprogram.o \
+			$(MESASHADERBUILDDIR)profiled/nvfragparse.o \
+			$(MESASHADERBUILDDIR)profiled/nvvertexec.o \
+			$(MESASHADERBUILDDIR)profiled/nvvertparse.o \
+			$(MESASHADERBUILDDIR)profiled/program.o
diff --git a/xc/lib/GL/mesa/tnl/Imakefile.inc b/xc/lib/GL/mesa/tnl/Imakefile.inc
index 067fb4ba1..d75651fcc 100644
--- a/xc/lib/GL/mesa/tnl/Imakefile.inc
+++ b/xc/lib/GL/mesa/tnl/Imakefile.inc
@@ -6,6 +6,11 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/tnl/Imakefile.inc,v 1.1tsi Exp $
 
 MESATNLBUILDDIR = MesaTnlBuildDir
 
+#if defined(i386Architecture) && MesaUseX86Asm
+#define MesaTnlAsmSrcs $(MESATNLBUILDDIR)t_vtx_x86.c \
+		  $(MESATNLBUILDDIR)t_vtx_x86_gcc.S
+#endif
+
   MESA_TNL_SRCS = $(MESATNLBUILDDIR)t_array_api.c \
 		  $(MESATNLBUILDDIR)t_array_import.c \
 		  $(MESATNLBUILDDIR)t_context.c \
@@ -25,7 +30,9 @@ MESATNLBUILDDIR = MesaTnlBuildDir
 		  $(MESATNLBUILDDIR)t_vertex.c \
 		  $(MESATNLBUILDDIR)t_vtx_api.c \
 		  $(MESATNLBUILDDIR)t_vtx_eval.c \
-		  $(MESATNLBUILDDIR)t_vtx_exec.c
+		  $(MESATNLBUILDDIR)t_vtx_exec.c \
+		  MesaTnlAsmSrcs \
+		  $(MESATNLBUILDDIR)t_vtx_generic.c
 
 #ifdef NeedToLinkMesaSrc
 LinkSourceFile(t_array_api.c, $(MESASRCDIR)/src/mesa/tnl)
@@ -59,6 +66,16 @@ LinkSourceFile(t_vtx_api.c, $(MESASRCDIR)/src/mesa/tnl)
 LinkSourceFile(t_vtx_api.h, $(MESASRCDIR)/src/mesa/tnl)
 LinkSourceFile(t_vtx_eval.c, $(MESASRCDIR)/src/mesa/tnl)
 LinkSourceFile(t_vtx_exec.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vtx_generic.c, $(MESASRCDIR)/src/mesa/tnl)
+#if defined(i386Architecture) && MesaUseX86Asm
+LinkSourceFile(t_vtx_x86.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vtx_x86_gcc.S, $(MESASRCDIR)/src/mesa/tnl)
+#endif
+#endif
+
+#if defined(i386Architecture) && MesaUseX86Asm
+#define MesaTnlAsmObjs  $(MESATNLBUILDDIR)t_vtx_x86.o \
+		  $(MESATNLBUILDDIR)t_vtx_x86_gcc.o
 #endif
 
   MESA_TNL_OBJS = $(MESATNLBUILDDIR)t_array_api.o \
@@ -80,9 +97,16 @@ LinkSourceFile(t_vtx_exec.c, $(MESASRCDIR)/src/mesa/tnl)
 		  $(MESATNLBUILDDIR)t_vertex.o \
 		  $(MESATNLBUILDDIR)t_vtx_api.o \
 		  $(MESATNLBUILDDIR)t_vtx_eval.o \
-		  $(MESATNLBUILDDIR)t_vtx_exec.o
+		  $(MESATNLBUILDDIR)t_vtx_exec.o \
+		  MesaTnlAsmObjs \
+		  $(MESATNLBUILDDIR)t_vtx_generic.o
 
 #if defined(DoSharedLib) && DoSharedLib
+#if defined(i386Architecture) && MesaUseX86Asm
+#define MesaTnlAsmUobjs $(MESATNLBUILDDIR)unshared/t_vtx_x86.o \
+		  $(MESATNLBUILDDIR)unshared/t_vtx_x86_gcc.o
+#endif
+
  MESA_TNL_UOBJS = $(MESATNLBUILDDIR)unshared/t_array_api.o \
 		  $(MESATNLBUILDDIR)unshared/t_array_import.o \
 		  $(MESATNLBUILDDIR)unshared/t_context.o \
@@ -102,11 +126,18 @@ LinkSourceFile(t_vtx_exec.c, $(MESASRCDIR)/src/mesa/tnl)
 		  $(MESATNLBUILDDIR)unshared/t_vertex.o \
 		  $(MESATNLBUILDDIR)unshared/t_vtx_api.o \
 		  $(MESATNLBUILDDIR)unshared/t_vtx_eval.o \
-		  $(MESATNLBUILDDIR)unshared/t_vtx_exec.o
+		  $(MESATNLBUILDDIR)unshared/t_vtx_exec.o \
+		  MesaTnlAsmUobjs \
+		  $(MESATNLBUILDDIR)unshared/t_vtx_generic.o
 #else
  MESA_TNL_UOBJS = $(MESA_TNL_OBJS)
 #endif
 
+#if defined(i386Architecture) && MesaUseX86Asm
+#define MesaTnlAsmDobjs $(MESATNLBUILDDIR)debugger/t_vtx_x86.o \
+		  $(MESATNLBUILDDIR)debugger/t_vtx_x86_gcc.o
+#endif
+
  MESA_TNL_DOBJS = $(MESATNLBUILDDIR)debugger/t_array_api.o \
 		  $(MESATNLBUILDDIR)debugger/t_array_import.o \
 		  $(MESATNLBUILDDIR)debugger/t_context.o \
@@ -126,7 +157,14 @@ LinkSourceFile(t_vtx_exec.c, $(MESASRCDIR)/src/mesa/tnl)
 		  $(MESATNLBUILDDIR)debugger/t_vertex.o \
 		  $(MESATNLBUILDDIR)debugger/t_vtx_api.o \
 		  $(MESATNLBUILDDIR)debugger/t_vtx_eval.o \
-		  $(MESATNLBUILDDIR)debugger/t_vtx_exec.o
+		  $(MESATNLBUILDDIR)debugger/t_vtx_exec.o \
+		  MesaTnlAsmDobjs \
+		  $(MESATNLBUILDDIR)debugger/t_vtx_generic.o
+
+#if defined(i386Architecture) && MesaUseX86Asm
+#define MesaTnlAsmPobjs $(MESATNLBUILDDIR)profiled/t_vtx_x86.o \
+		  $(MESATNLBUILDDIR)profiled/t_vtx_x86_gcc.o
+#endif
 
  MESA_TNL_POBJS = $(MESATNLBUILDDIR)profiled/t_array_api.o \
 		  $(MESATNLBUILDDIR)profiled/t_array_import.o \
@@ -147,4 +185,6 @@ LinkSourceFile(t_vtx_exec.c, $(MESASRCDIR)/src/mesa/tnl)
 		  $(MESATNLBUILDDIR)profiled/t_vertex.o \
 		  $(MESATNLBUILDDIR)profiled/t_vtx_api.o \
 		  $(MESATNLBUILDDIR)profiled/t_vtx_eval.o \
-		  $(MESATNLBUILDDIR)profiled/t_vtx_exec.o
+		  $(MESATNLBUILDDIR)profiled/t_vtx_exec.o \
+		  MesaTnlAsmPobjs \
+		  $(MESATNLBUILDDIR)profiled/t_vtx_generic.o
diff --git a/xc/programs/Xserver/GL/mesa/GLcore/Imakefile b/xc/programs/Xserver/GL/mesa/GLcore/Imakefile
index 416fc866a..a689bf620 100644
--- a/xc/programs/Xserver/GL/mesa/GLcore/Imakefile
+++ b/xc/programs/Xserver/GL/mesa/GLcore/Imakefile
@@ -19,6 +19,7 @@ SUBDIRS = module
 #define MesaSwrastBuildDir ../swrast/
 #define MesaSwrastSetupBuildDir ../swrast_setup/
 #define MesaTnlBuildDir ../tnl/
+#define MesaShaderBuildDir ../shader/
 #define MesaXBuildDir ../X/
 
 #include "../../../../../lib/GL/mesa/array_cache/Imakefile.inc"
@@ -27,6 +28,7 @@ SUBDIRS = module
 #include "../../../../../lib/GL/mesa/tnl/Imakefile.inc"
 #include "../../../../../lib/GL/mesa/main/Imakefile.inc"
 #include "../../../../../lib/GL/mesa/math/Imakefile.inc"
+#include "../../../../../lib/GL/mesa/shader/Imakefile.inc"
 #include "../../../../../lib/GL/mesa/drivers/x11/Imakefile.inc"
 #include "../../../../../lib/GL/mesa/Imakefile.inc"
 
@@ -41,7 +43,7 @@ SUBDIRS = module
 
         DONES = ../main/DONE ../X/DONE ../array_cache/DONE \
 		../math/DONE ../swrast/DONE ../swrast_setup/DONE \
-		../tnl/DONE
+		../tnl/DONE ../shader/DONE
 
      INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \
 		-I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include \
diff --git a/xc/programs/Xserver/GL/mesa/Imakefile b/xc/programs/Xserver/GL/mesa/Imakefile
index 12b2dad13..ea7d18aa2 100644
--- a/xc/programs/Xserver/GL/mesa/Imakefile
+++ b/xc/programs/Xserver/GL/mesa/Imakefile
@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/Imakefile,v 1.23 2002/11/22 22:5
 
 #if !defined(IHaveModules) || !BuildModuleInSubdir
 #define IHaveSubdirs
-      SUBDIRS = main math array_cache swrast swrast_setup tnl X GLcore $(MODSUBDIR)
+      SUBDIRS = main math array_cache swrast swrast_setup tnl shader X GLcore $(MODSUBDIR)
 #endif
 
 #include <Server.tmpl>
diff --git a/xc/programs/Xserver/GL/mesa/main/Imakefile b/xc/programs/Xserver/GL/mesa/main/Imakefile
index f1333286f..4128cc271 100644
--- a/xc/programs/Xserver/GL/mesa/main/Imakefile
+++ b/xc/programs/Xserver/GL/mesa/main/Imakefile
@@ -25,6 +25,7 @@ SUBDIRS = module
 
      INCLUDES = -I$(MESASRCDIR)/src/mesa \
 		-I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/shader \
 		-I$(MESASRCDIR)/src/mesa/glapi \
 		-I$(MESASRCDIR)/include \
                 -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
diff --git a/xc/programs/Xserver/GL/mesa/shader/Imakefile b/xc/programs/Xserver/GL/mesa/shader/Imakefile
new file mode 100644
index 000000000..43b4dff8f
--- /dev/null
+++ b/xc/programs/Xserver/GL/mesa/shader/Imakefile
@@ -0,0 +1,55 @@
+XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/math/Imakefile,v 1.8 2002/11/22 22:56:01 tsi Exp $
+
+#if DoLoadableServer
+#if !BuildModuleInSubdir
+#define IHaveModules
+#elif !defined(IHaveModules)
+#define IHaveSubdirs
+SUBDIRS = module
+#endif
+#endif
+
+#include <Server.tmpl>
+
+#define NeedAllMesaSrc
+#define NeedToLinkMesaSrc
+#define MesaShaderBuildDir /**/
+#if !defined(IHaveModules) || !BuildModuleInSubdir
+#include "../../../../../lib/GL/mesa/shader/Imakefile.inc"
+#else
+#include "../../../../../../lib/GL/mesa/shader/Imakefile.inc"
+#endif
+
+         SRCS = $(MESA_SHADER_SRCS)
+         OBJS = $(MESA_SHADER_OBJS)
+
+     INCLUDES = -I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/shader \
+		-I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/include \
+                -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
+                -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/GL/glx \
+                -I$(LIBSRC)/GL/include \
+                -I$(XF86SRC) -I$(INCLUDESRC)
+
+      DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/
+
+#ifdef IHaveModules
+ModuleObjectRule()
+#else
+NormalLibraryObjectRule()
+#endif
+
+SubdirLibraryRule($(OBJS))
+
+LintLibraryTarget(dri,$(SRCS))
+NormalLintTarget($(SRCS))
+
+DependTarget()
+
+#ifdef IHaveSubdirs
+MakeSubdirs($(SUBDIRS))
+DependSubdirs($(SUBDIRS))
+#endif
+