First DRI release of 3dfx driver.

1 files changed, 192 insertions, 15 deletions

diff --git a/xc/lib/GL/mesa/src/Imakefile b/xc/lib/GL/mesa/src/Imakefile
index e1161a625..d736b875b 100644
--- a/xc/lib/GL/mesa/src/Imakefile
+++ b/xc/lib/GL/mesa/src/Imakefile
@@ -11,6 +11,173 @@ XCOMM $PI: xc/lib/GL/mesa/src/Imakefile,v 1.5 1999/06/21 05:13:55 martin Exp $
 ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
 #endif
 
+#if GlxBuiltInTdfx
+    TDFX_DEFS = -DFX
+#endif
+
+LinkSourceFile(accum.c, ../../../../extras/Mesa/src)
+LinkSourceFile(accum.h, ../../../../extras/Mesa/src)
+LinkSourceFile(all.h, ../../../../extras/Mesa/src)
+LinkSourceFile(alpha.c, ../../../../extras/Mesa/src)
+LinkSourceFile(alpha.h, ../../../../extras/Mesa/src)
+LinkSourceFile(alphabuf.c, ../../../../extras/Mesa/src)
+LinkSourceFile(alphabuf.h, ../../../../extras/Mesa/src)
+LinkSourceFile(api.h, ../../../../extras/Mesa/src)
+LinkSourceFile(api1.c, ../../../../extras/Mesa/src)
+LinkSourceFile(api2.c, ../../../../extras/Mesa/src)
+LinkSourceFile(apiext.c, ../../../../extras/Mesa/src)
+LinkSourceFile(attrib.c, ../../../../extras/Mesa/src)
+LinkSourceFile(attrib.h, ../../../../extras/Mesa/src)
+LinkSourceFile(bbox.c, ../../../../extras/Mesa/src)
+LinkSourceFile(bbox.h, ../../../../extras/Mesa/src)
+LinkSourceFile(bitmap.c, ../../../../extras/Mesa/src)
+LinkSourceFile(bitmap.h, ../../../../extras/Mesa/src)
+LinkSourceFile(blend.c, ../../../../extras/Mesa/src)
+LinkSourceFile(blend.h, ../../../../extras/Mesa/src)
+LinkSourceFile(clip.c, ../../../../extras/Mesa/src)
+LinkSourceFile(clip.h, ../../../../extras/Mesa/src)
+LinkSourceFile(clip_funcs.h, ../../../../extras/Mesa/src)
+LinkSourceFile(clip_tmp.h, ../../../../extras/Mesa/src)
+LinkSourceFile(colortab.c, ../../../../extras/Mesa/src)
+LinkSourceFile(colortab.h, ../../../../extras/Mesa/src)
+LinkSourceFile(config.c, ../../../../extras/Mesa/src)
+LinkSourceFile(config.h, ../../../../extras/Mesa/src)
+LinkSourceFile(context.c, ../../../../extras/Mesa/src)
+LinkSourceFile(context.h, ../../../../extras/Mesa/src)
+LinkSourceFile(copy_tmp.h, ../../../../extras/Mesa/src)
+LinkSourceFile(copypix.c, ../../../../extras/Mesa/src)
+LinkSourceFile(copypix.h, ../../../../extras/Mesa/src)
+LinkSourceFile(cull_tmp.h, ../../../../extras/Mesa/src)
+LinkSourceFile(cva.c, ../../../../extras/Mesa/src)
+LinkSourceFile(cva.h, ../../../../extras/Mesa/src)
+LinkSourceFile(dd.h, ../../../../extras/Mesa/src)
+LinkSourceFile(debug_xform.c, ../../../../extras/Mesa/src)
+LinkSourceFile(debug_xform.h, ../../../../extras/Mesa/src)
+LinkSourceFile(depth.c, ../../../../extras/Mesa/src)
+LinkSourceFile(depth.h, ../../../../extras/Mesa/src)
+LinkSourceFile(dlist.c, ../../../../extras/Mesa/src)
+LinkSourceFile(dlist.h, ../../../../extras/Mesa/src)
+LinkSourceFile(dotprod_tmp.h, ../../../../extras/Mesa/src)
+LinkSourceFile(drawpix.c, ../../../../extras/Mesa/src)
+LinkSourceFile(drawpix.h, ../../../../extras/Mesa/src)
+LinkSourceFile(enable.c, ../../../../extras/Mesa/src)
+LinkSourceFile(enable.h, ../../../../extras/Mesa/src)
+LinkSourceFile(enums.c, ../../../../extras/Mesa/src)
+LinkSourceFile(enums.h, ../../../../extras/Mesa/src)
+LinkSourceFile(eval.c, ../../../../extras/Mesa/src)
+LinkSourceFile(eval.h, ../../../../extras/Mesa/src)
+LinkSourceFile(extensions.c, ../../../../extras/Mesa/src)
+LinkSourceFile(extensions.h, ../../../../extras/Mesa/src)
+LinkSourceFile(feedback.c, ../../../../extras/Mesa/src)
+LinkSourceFile(feedback.h, ../../../../extras/Mesa/src)
+LinkSourceFile(fixed.h, ../../../../extras/Mesa/src)
+LinkSourceFile(fog.c, ../../../../extras/Mesa/src)
+LinkSourceFile(fog.h, ../../../../extras/Mesa/src)
+LinkSourceFile(fog_tmp.h, ../../../../extras/Mesa/src)
+LinkSourceFile(general_clip.h, ../../../../extras/Mesa/src)
+LinkSourceFile(get.c, ../../../../extras/Mesa/src)
+LinkSourceFile(get.h, ../../../../extras/Mesa/src)
+LinkSourceFile(glmisc.c, ../../../../extras/Mesa/src)
+LinkSourceFile(glmisc.h, ../../../../extras/Mesa/src)
+LinkSourceFile(hash.c, ../../../../extras/Mesa/src)
+LinkSourceFile(hash.h, ../../../../extras/Mesa/src)
+LinkSourceFile(image.c, ../../../../extras/Mesa/src)
+LinkSourceFile(image.h, ../../../../extras/Mesa/src)
+LinkSourceFile(indirect_tmp.h, ../../../../extras/Mesa/src)
+LinkSourceFile(interp_tmp.h, ../../../../extras/Mesa/src)
+LinkSourceFile(light.c, ../../../../extras/Mesa/src)
+LinkSourceFile(light.h, ../../../../extras/Mesa/src)
+LinkSourceFile(lines.c, ../../../../extras/Mesa/src)
+LinkSourceFile(lines.h, ../../../../extras/Mesa/src)
+LinkSourceFile(linetemp.h, ../../../../extras/Mesa/src)
+LinkSourceFile(lnaatemp.h, ../../../../extras/Mesa/src)
+LinkSourceFile(logic.c, ../../../../extras/Mesa/src)
+LinkSourceFile(logic.h, ../../../../extras/Mesa/src)
+LinkSourceFile(macros.h, ../../../../extras/Mesa/src)
+LinkSourceFile(masking.c, ../../../../extras/Mesa/src)
+LinkSourceFile(masking.h, ../../../../extras/Mesa/src)
+LinkSourceFile(matrix.c, ../../../../extras/Mesa/src)
+LinkSourceFile(matrix.h, ../../../../extras/Mesa/src)
+LinkSourceFile(mmath.c, ../../../../extras/Mesa/src)
+LinkSourceFile(mmath.h, ../../../../extras/Mesa/src)
+LinkSourceFile(mthreads.c, ../../../../extras/Mesa/src)
+LinkSourceFile(mthreads.h, ../../../../extras/Mesa/src)
+LinkSourceFile(norm_tmp.h, ../../../../extras/Mesa/src)
+LinkSourceFile(pb.c, ../../../../extras/Mesa/src)
+LinkSourceFile(pb.h, ../../../../extras/Mesa/src)
+LinkSourceFile(pipeline.c, ../../../../extras/Mesa/src)
+LinkSourceFile(pipeline.h, ../../../../extras/Mesa/src)
+LinkSourceFile(pixel.c, ../../../../extras/Mesa/src)
+LinkSourceFile(pixel.h, ../../../../extras/Mesa/src)
+LinkSourceFile(pointers.c, ../../../../extras/Mesa/src)
+LinkSourceFile(pointers.h, ../../../../extras/Mesa/src)
+LinkSourceFile(points.c, ../../../../extras/Mesa/src)
+LinkSourceFile(points.h, ../../../../extras/Mesa/src)
+LinkSourceFile(polygon.c, ../../../../extras/Mesa/src)
+LinkSourceFile(polygon.h, ../../../../extras/Mesa/src)
+LinkSourceFile(quads.c, ../../../../extras/Mesa/src)
+LinkSourceFile(quads.h, ../../../../extras/Mesa/src)
+LinkSourceFile(rastpos.c, ../../../../extras/Mesa/src)
+LinkSourceFile(rastpos.h, ../../../../extras/Mesa/src)
+LinkSourceFile(readpix.c, ../../../../extras/Mesa/src)
+LinkSourceFile(readpix.h, ../../../../extras/Mesa/src)
+LinkSourceFile(rect.c, ../../../../extras/Mesa/src)
+LinkSourceFile(rect.h, ../../../../extras/Mesa/src)
+LinkSourceFile(render_tmp.h, ../../../../extras/Mesa/src)
+LinkSourceFile(scissor.c, ../../../../extras/Mesa/src)
+LinkSourceFile(scissor.h, ../../../../extras/Mesa/src)
+LinkSourceFile(shade.c, ../../../../extras/Mesa/src)
+LinkSourceFile(shade.h, ../../../../extras/Mesa/src)
+LinkSourceFile(shade_tmp.h, ../../../../extras/Mesa/src)
+LinkSourceFile(simple_list.h, ../../../../extras/Mesa/src)
+LinkSourceFile(span.c, ../../../../extras/Mesa/src)
+LinkSourceFile(span.h, ../../../../extras/Mesa/src)
+LinkSourceFile(stages.c, ../../../../extras/Mesa/src)
+LinkSourceFile(stages.h, ../../../../extras/Mesa/src)
+LinkSourceFile(stencil.c, ../../../../extras/Mesa/src)
+LinkSourceFile(stencil.h, ../../../../extras/Mesa/src)
+LinkSourceFile(texgen_tmp.h, ../../../../extras/Mesa/src)
+LinkSourceFile(teximage.c, ../../../../extras/Mesa/src)
+LinkSourceFile(teximage.h, ../../../../extras/Mesa/src)
+LinkSourceFile(texobj.c, ../../../../extras/Mesa/src)
+LinkSourceFile(texobj.h, ../../../../extras/Mesa/src)
+LinkSourceFile(texstate.c, ../../../../extras/Mesa/src)
+LinkSourceFile(texstate.h, ../../../../extras/Mesa/src)
+LinkSourceFile(texture.c, ../../../../extras/Mesa/src)
+LinkSourceFile(texture.h, ../../../../extras/Mesa/src)
+LinkSourceFile(trans_tmp.h, ../../../../extras/Mesa/src)
+LinkSourceFile(translate.c, ../../../../extras/Mesa/src)
+LinkSourceFile(translate.h, ../../../../extras/Mesa/src)
+LinkSourceFile(triangle.c, ../../../../extras/Mesa/src)
+LinkSourceFile(triangle.h, ../../../../extras/Mesa/src)
+LinkSourceFile(tritemp.h, ../../../../extras/Mesa/src)
+LinkSourceFile(types.h, ../../../../extras/Mesa/src)
+LinkSourceFile(varray.c, ../../../../extras/Mesa/src)
+LinkSourceFile(varray.h, ../../../../extras/Mesa/src)
+LinkSourceFile(vb.c, ../../../../extras/Mesa/src)
+LinkSourceFile(vb.h, ../../../../extras/Mesa/src)
+LinkSourceFile(vbcull.c, ../../../../extras/Mesa/src)
+LinkSourceFile(vbcull.h, ../../../../extras/Mesa/src)
+LinkSourceFile(vbfill.c, ../../../../extras/Mesa/src)
+LinkSourceFile(vbfill.h, ../../../../extras/Mesa/src)
+LinkSourceFile(vbindirect.c, ../../../../extras/Mesa/src)
+LinkSourceFile(vbindirect.h, ../../../../extras/Mesa/src)
+LinkSourceFile(vbrender.c, ../../../../extras/Mesa/src)
+LinkSourceFile(vbrender.h, ../../../../extras/Mesa/src)
+LinkSourceFile(vbxform.c, ../../../../extras/Mesa/src)
+LinkSourceFile(vbxform.h, ../../../../extras/Mesa/src)
+LinkSourceFile(vector.c, ../../../../extras/Mesa/src)
+LinkSourceFile(vector.h, ../../../../extras/Mesa/src)
+LinkSourceFile(vertices.c, ../../../../extras/Mesa/src)
+LinkSourceFile(vertices.h, ../../../../extras/Mesa/src)
+LinkSourceFile(winpos.c, ../../../../extras/Mesa/src)
+LinkSourceFile(winpos.h, ../../../../extras/Mesa/src)
+LinkSourceFile(xform.c, ../../../../extras/Mesa/src)
+LinkSourceFile(xform.h, ../../../../extras/Mesa/src)
+LinkSourceFile(xform_tmp.h, ../../../../extras/Mesa/src)
+LinkSourceFile(zoom.c, ../../../../extras/Mesa/src)
+LinkSourceFile(zoom.h, ../../../../extras/Mesa/src)
+
     CORE_SRCS = accum.c alpha.c alphabuf.c api1.c api2.c apiext.c \
                 attrib.c bitmap.c blend.c clip.c colortab.c context.c \
                 copypix.c depth.c dlist.c drawpix.c enable.c eval.c \
@@ -20,7 +187,11 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
                 rastpos.c readpix.c rect.c scissor.c shade.c span.c \
                 stencil.c teximage.c texobj.c texstate.c texture.c \
                 triangle.c varray.c winpos.c vb.c vbfill.c vbrender.c \
-                vbxform.c xform.c zoom.c
+                vbxform.c xform.c zoom.c stages.c \
+		bbox.c config.c cva.c enums.c extensions.c \
+		pipeline.c translate.c vbcull.c vbindirect.c vector.c \
+		vertices.c
+
     CORE_OBJS = accum.o alpha.o alphabuf.o api1.o api2.o apiext.o \
                 attrib.o bitmap.o blend.o clip.o colortab.o context.o \
                 copypix.o depth.o dlist.o drawpix.o enable.o eval.o \
@@ -30,15 +201,20 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
                 rastpos.o readpix.o rect.o scissor.o shade.o span.o \
                 stencil.o teximage.o texobj.o texstate.o texture.o \
                 triangle.o varray.o winpos.o vb.o vbfill.o vbrender.o \
-                vbxform.o xform.o zoom.o
+                vbxform.o xform.o zoom.o stages.o \
+		bbox.o config.o cva.o enums.o extensions.o \
+		pipeline.o translate.o vbcull.o vbindirect.o vector.o \
+		vertices.o
 
-     ASM_SRCS = asm_386.S
-     ASM_OBJS = asm_386.o
+     ASM_SRCS = 
+     ASM_OBJS = 
+     ASM_DEFS = -DUSE_MMX_ASM -DUSE_X86_ASM 
+# -DUSE_3DNOW_ASM
 
-      DEFINES = $(ALLOC_DEFINES) GlxDefines
+      DEFINES = $(ALLOC_DEFINES) GlxDefines $(TDFX_DEFS) $(ASM_DEFS)
      INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) -I../include -I../../dri
-         SRCS = $(CORE_SRCS) /* $(ASM_SRCS) */
-         OBJS = $(CORE_OBJS) /* $(ASM_OBJS) */
+         SRCS = $(CORE_SRCS) $(ASM_SRCS)
+         OBJS = $(CORE_OBJS) $(ASM_OBJS)
 
 #if !GlxUseBuiltInDRIDriver
 #undef DoNormalLib NormalLibGlx
@@ -47,9 +223,12 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
 #undef DoProfileLib ProfileLibGlx
 #endif
 
-#if GlxBuiltInMesa || !GlxUseBuiltInDRIDriver
+#if GlxBuiltInMesa || GlxDriverUsesMesa || !GlxUseBuiltInDRIDriver
+# We have to go into X to make the xmesaP.h symbolic link
   MESASUBDIRS = X
 
+  ASMSUBDIRS = X86
+
 #include <Library.tmpl>
 
 LibraryObjectRule()
@@ -61,19 +240,17 @@ NormalLintTarget($(SRCS))
 #define IHaveSubdirs
 #define PassCDebugFlags
 
-SUBDIRS = $(MESASUBDIRS) drv
+SUBDIRS = $(MESASUBDIRS) $(ASMSUBDIRS) drv
 
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
 
-#if !GlxUseBuiltInDRIDriver
-LIBNAME = mesa.so
-ALL_OBJS = $(CORE_OBJS) X/?*.o
-ALL_DEPS = $(SUBDIRS) DONE X/DONE
+#if !GlxUseBuiltInDRIDriver && !GlxDriverUsesMesa
+LIBNAME = mesa_dri.so
+ALL_OBJS = $(CORE_OBJS) X/?*.o X86/?*.o
+ALL_DEPS = $(SUBDIRS) DONE X/DONE X86/DONE
 SharedDepModuleTarget($(LIBNAME),$(ALL_DEPS),$(ALL_OBJS))
 InstallDynamicModule($(LIBNAME),$(MODULEDIR),.)
 #endif
 
 DependTarget()
-
-InstallDriverSDKDynamicModule($(LIBNAME),$(DRIVERSDKMODULEDIR),.)