support for new cpuid and mmx texture downloads

2004-11-25 19:13:22 +00:00
parent 1b53dbd236
commit cb935e9a6f
4 changed files with 69 additions and 13 deletions
--- a/glide3x/cvg/glide3/src/Makefile.DJ
+++ b/glide3x/cvg/glide3/src/Makefile.DJ
@@ -20,6 +20,9 @@
 #			default = no
 #	USE_X86=1	use assembler triangle specializations; req by CVG
 #			default = no
+#	USE_MMX=1	allow MMX specializations. However, the true CPU
+#			capabilities are still checked at run-time to avoid
+#			crashes.
 #	USE_3DNOW=1	allow 3DNow! specializations. However, the true CPU
 #			capabilities are still checked at run-time to avoid
 #			crashes.
@@ -124,6 +127,11 @@ CFLAGS += $(CDEFS)

 override USE_X86 = 1

+ifeq ($(USE_MMX),1)
+CFLAGS += -DGL_MMX
+override USE_X86 = 1
+endif
+
 ifeq ($(USE_3DNOW),1)
 CFLAGS += -DGL_AMD3D
 override USE_X86 = 1
@@ -166,6 +174,10 @@ ifeq ($(USE_X86),1)
 GLIDE_OBJECTS += \
 	xdraw2_def.o \
 	xdraw3_def.o
+ifeq ($(USE_MMX),1)
+GLIDE_OBJECTS += \
+	xtexdl_mmx.obj
+endif
 ifeq ($(USE_3DNOW),1)
 GLIDE_OBJECTS += \
 	xdraw2_3dnow.o \
@@ -259,14 +271,16 @@ endif
 #	rules(2)
 ###############################################################################

-cpuid.o: cpudtect.asm
-	$(AS) -o $@ $(ASFLAGS) $<
+#cpuid.o: cpudtect.asm
+#	$(AS) -o $@ $(ASFLAGS) $<
 xdraw2_def.o: xdraw2.asm
 	$(AS) -o $@ $(ASFLAGS) $<
 xdraw3_def.o: xdraw3.asm
 	$(AS) -o $@ $(ASFLAGS) $<
 xtexdl_def.o: xtexdl.c
 	$(CC) -o $@ $(CFLAGS) -c $<
+xtexdl_mmx.obj: xtexdl.asm
+	$(AS) -o $@ $(ASFLAGS) -DGL_MMX=1 $<
 xdraw2_3dnow.o: xdraw2.asm
 	$(AS) -o $@ $(ASFLAGS) -DGL_AMD3D=1 $<
 xdraw3_3dnow.o: xdraw3.asm
--- a/glide3x/cvg/glide3/src/Makefile.wat
+++ b/glide3x/cvg/glide3/src/Makefile.wat
@@ -21,6 +21,9 @@
 #			default = no
 #	USE_X86=1	use assembler triangle specializations; req by CVG
 #			default = no
+#	USE_MMX=1	allow MMX specializations. However, the true CPU
+#			capabilities are still checked at run-time to avoid
+#			crashes.
 #	USE_3DNOW=1	allow 3DNow! specializations. However, the true CPU
 #			capabilities are still checked at run-time to avoid
 #			crashes.
@@ -122,6 +125,11 @@ CFLAGS += $(CDEFS)

 override USE_X86 = 1

+ifeq ($(USE_MMX),1)
+CFLAGS += -DGL_MMX
+override USE_X86 = 1
+endif
+
 ifeq ($(USE_3DNOW),1)
 CFLAGS += -DGL_AMD3D
 override USE_X86 = 1
@@ -168,6 +176,10 @@ ifeq ($(USE_X86),1)
 GLIDE_OBJECTS += \
 	xdraw2_d.obj \
 	xdraw3_d.obj
+ifeq ($(USE_MMX),1)
+GLIDE_OBJECTS += \
+	xtexdl_mmx.obj
+endif
 ifeq ($(USE_3DNOW),1)
 GLIDE_OBJECTS += \
 	xdraw2_3.obj \
@@ -254,14 +266,16 @@ endif
 #	rules(2)
 ###############################################################################

-cpuid.obj: cpudtect.asm
-	$(AS) -o $@ $(ASFLAGS) $<
+#cpuid.obj: cpudtect.asm
+#	$(AS) -o $@ $(ASFLAGS) $<
 xdraw2_d.obj: xdraw2.asm
 	$(AS) -o $@ $(ASFLAGS) $<
 xdraw3_d.obj: xdraw3.asm
 	$(AS) -o $@ $(ASFLAGS) $<
 xtexdl_d.obj: xtexdl.c
 	$(CC) -fo=$@ -c $<
+xtexdl_mmx.obj: xtexdl.asm
+	$(AS) -o $@ $(ASFLAGS) -DGL_MMX=1 $<
 xdraw2_3.obj: xdraw2.asm
 	$(AS) -o $@ $(ASFLAGS) -DGL_AMD3D=1 $<
 xdraw3_3.obj: xdraw3.asm
--- a/glide3x/cvg/glide3/src/Makefile.win32
+++ b/glide3x/cvg/glide3/src/Makefile.win32
@@ -21,6 +21,9 @@
 #			default = no
 #	USE_X86=1	use assembler triangle specializations; req by CVG
 #			default = no
+#	USE_MMX=1	allow MMX specializations. However, the true CPU
+#			capabilities are still checked at run-time to avoid
+#			crashes.
 #	USE_3DNOW=1	allow 3DNow! specializations. However, the true CPU
 #			capabilities are still checked at run-time to avoid
 #			crashes.
@@ -129,6 +132,11 @@ CFLAGS += $(CDEFS)

 override USE_X86 = 1

+ifeq ($(USE_MMX),1)
+CFLAGS += -DGL_MMX
+override USE_X86 = 1
+endif
+
 ifeq ($(USE_3DNOW),1)
 CFLAGS += -DGL_AMD3D
 override USE_X86 = 1
@@ -171,6 +179,10 @@ ifeq ($(USE_X86),1)
 GLIDE_OBJECTS += \
 	xdraw2_def.obj \
 	xdraw3_def.obj
+ifeq ($(USE_MMX),1)
+GLIDE_OBJECTS += \
+	xtexdl_mmx.obj
+endif
 ifeq ($(USE_3DNOW),1)
 GLIDE_OBJECTS += \
 	xdraw2_3dnow.obj \
@@ -251,24 +263,26 @@ $(GLIDE_LIBDIR)/$(GLIDE_DLL): $(GLIDE_OBJECTS) $(GLIDE_RES)
 	$(LD) -out:$@ $(LDFLAGS) $(GLIDE_OBJECTS) $(LDLIBS) $(GLIDE_RES)

 $(TEXUS_EXEDIR)/$(TEXUS_EXE): $(FX_GLIDE_SW)/texus2/cmd/cmd.c $(GLIDE_LIBDIR)/$(GLIDE_IMP)
-#ifeq ($(TEXUS2),1)
-#	$(CC) -o $@ $(CFLAGS) $^
-#else
-#	$(warning Texus2 not enabled... Skipping $(TEXUS_EXE))
-#endif
+ifeq ($(TEXUS2),1)
+	$(CC) -o $@ $(CFLAGS) $^
+else
+	$(warning Texus2 not enabled... Skipping $(TEXUS_EXE))
+endif

 ###############################################################################
 #	rules(2)
 ###############################################################################

-cpuid.obj: cpudtect.asm
-	$(AS) -o $@ $(ASFLAGS) $<
+#cpuid.obj: cpudtect.asm
+#	$(AS) -o $@ $(ASFLAGS) $<
 xdraw2_def.obj: xdraw2.asm
 	$(AS) -o $@ $(ASFLAGS) $<
 xdraw3_def.obj: xdraw3.asm
 	$(AS) -o $@ $(ASFLAGS) $<
 xtexdl_def.obj: xtexdl.c
 	$(CC) -Fo$@ $(CFLAGS) -c $<
+xtexdl_mmx.obj: xtexdl.asm
+	$(AS) -o $@ $(ASFLAGS) -DGL_MMX=1 $<
 xdraw2_3dnow.obj: xdraw2.asm
 	$(AS) -o $@ $(ASFLAGS) -DGL_AMD3D=1 $<
 xdraw3_3dnow.obj: xdraw3.asm
--- a/glide3x/cvg/glide3/src/makefile.linux
+++ b/glide3x/cvg/glide3/src/makefile.linux
@@ -20,6 +20,9 @@
 #			default = no
 #	USE_X86=1	use assembler triangle specializations; req by CVG
 #			default = no
+#	USE_MMX=1	allow MMX specializations. However, the true CPU
+#			capabilities are still checked at run-time to avoid
+#			crashes.
 #	USE_3DNOW=1	allow 3DNow! specializations. However, the true CPU
 #			capabilities are still checked at run-time to avoid
 #			crashes.
@@ -120,6 +123,11 @@ CFLAGS += $(CDEFS)

 override USE_X86 = 1

+ifeq ($(USE_MMX),1)
+CFLAGS += -DGL_MMX
+override USE_X86 = 1
+endif
+
 ifeq ($(USE_3DNOW),1)
 CFLAGS += -DGL_AMD3D
 override USE_X86 = 1
@@ -162,6 +170,10 @@ ifeq ($(USE_X86),1)
 GLIDE_OBJECTS += \
 	xdraw2_def.o \
 	xdraw3_def.o
+ifeq ($(USE_MMX),1)
+GLIDE_OBJECTS += \
+	xtexdl_mmx.obj
+endif
 ifeq ($(USE_3DNOW),1)
 GLIDE_OBJECTS += \
 	xdraw2_3dnow.o \
@@ -253,14 +265,16 @@ endif
 #	rules(2)
 ###############################################################################

-cpuid.o: cpudtect.asm
-	$(AS) -o $@ $(ASFLAGS) $<
+#cpuid.o: cpudtect.asm
+#	$(AS) -o $@ $(ASFLAGS) $<
 xdraw2_def.o: xdraw2.asm
 	$(AS) -o $@ $(ASFLAGS) $<
 xdraw3_def.o: xdraw3.asm
 	$(AS) -o $@ $(ASFLAGS) $<
 xtexdl_def.o: xtexdl.c
 	$(CC) -o $@ $(CFLAGS) -c $<
+xtexdl_mmx.obj: xtexdl.asm
+	$(AS) -o $@ $(ASFLAGS) -DGL_MMX=1 $<
 xdraw2_3dnow.o: xdraw2.asm
 	$(AS) -o $@ $(ASFLAGS) -DGL_AMD3D=1 $<
 xdraw3_3dnow.o: xdraw3.asm