rpms/Glide3/devel Glide3-64bit.patch, 1.1, 1.2 Glide3-fixes.patch, 1.2, 1.3 Glide3-new-autotools-bugfix.patch, 1.1, 1.2 Glide3.spec, 1.4, 1.5
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Wed May 4 15:14:48 UTC 2005
Author: jwrdegoede
Update of /cvs/extras/rpms/Glide3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7211
Modified Files:
Glide3-64bit.patch Glide3-fixes.patch
Glide3-new-autotools-bugfix.patch Glide3.spec
Log Message:
- Tested amd3dnow code on a voodoo2, works for me (tm). Enabled
amd3dnow code on i386 for now.
- Added FX_GLIDE_I386 AM-conditonal and define, only use and build
cpudtect.s when this is set. This should fix the cpudtect assemble problem
on x86_64. Made this part of Glide-64bit.patch.
Glide3-64bit.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 Glide3-64bit.patch
Index: Glide3-64bit.patch
===================================================================
RCS file: /cvs/extras/rpms/Glide3/devel/Glide3-64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Glide3-64bit.patch 30 Apr 2005 10:18:56 -0000 1.1
+++ Glide3-64bit.patch 4 May 2005 15:14:46 -0000 1.2
@@ -1,676 +1,288 @@
---- /dev/null 2005-04-30 08:31:53.801011088 +0200
-+++ Glide3/set-for-dri 2005-04-30 10:15:04.420741976 +0200
-@@ -0,0 +1,7 @@
-+for n in ./h3/glide3/src/gglide.c ./h3/glide3/src/glfb.c ./h3/glide3/src/gsst.c ./h3/minihwc/linhwc.c
-+do
-+ rn=$(basename $n).dri
-+ echo ln -sf $rn $n
-+ ln -sf $rn $n
-+done
-+
---- Glide3/h3/minihwc/linhwc.c.save.64bit 2000-03-20 22:42:57.000000000 +0100
-+++ Glide3/h3/minihwc/linhwc.c.save 2005-04-30 10:15:04.312758392 +0200
-@@ -64,7 +64,13 @@
- #include <X11/extensions/xf86vmode.h>
-
- static FxU32 fenceVar;
--#define P6FENCE asm("xchg %%eax, %0" : : "m" (fenceVar) : "eax");
-+#ifdef __ia64__
+--- Glide3/cvg/init/sst1init.h.64bit 2000-11-16 20:26:02.000000000 +0100
++++ Glide3/cvg/init/sst1init.h 2005-05-04 17:05:03.000000000 +0200
+@@ -146,9 +146,13 @@
+ # define P6FENCE {_asm xchg eax, p6FenceVar}
+ #elif defined(macintosh) && __POWERPC__ && defined(__MWERKS__)
+ # define P6FENCE __eieio()
+-#elif defined (__GNUC__) && defined(__i386__)
++#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+ # define P6FENCE asm("xchg %%eax,%0" : /*outputs*/ : "m" (p6FenceVar) : \
+ "eax");
++#elif defined(__GNUC__) && defined(__ia64__)
+# define P6FENCE asm volatile ("mf.a" ::: "memory");
-+#elif defined(__alpha__)
++#elif defined(__GNUC__) && defined(__alpha__)
+# define P6FENCE asm volatile("mb" ::: "memory");
-+#else
-+# define P6FENCE asm("xchg %%eax, %0" : : "m" (fenceVar) : "eax");
+ #else
+ # error "P6 Fencing in-line assembler code needs to be added for this compiler"
+ #endif
+--- Glide3/cvg/glide3/src/fxglide.h.64bit 1999-12-07 22:42:31.000000000 +0100
++++ Glide3/cvg/glide3/src/fxglide.h 2005-05-04 17:05:03.000000000 +0200
+@@ -412,6 +412,13 @@
+ #define P6FENCE p6Fence()
+ #elif defined(__MSC__)
+ #define P6FENCE {_asm xchg eax, p6FenceVar}
++#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
++# define P6FENCE asm("xchg %%eax,%0" : /*outputs*/ : "m" (p6FenceVar) : \
++ "eax");
++#elif defined(__GNUC__) && defined(__ia64__)
++# define P6FENCE asm volatile ("mf.a" ::: "memory");
++#elif defined(__GNUC__) && defined(__alpha__)
++# define P6FENCE asm volatile("mb" ::: "memory");
+ #else
+ #error "P6 Fencing in-line assembler code needs to be added for this compiler"
+ #endif /* Compiler specific fence commands */
+@@ -1282,7 +1289,9 @@
+ struct _GlideRoot_s {
+ int p6Fencer; /* xchg to here to keep this in cache!!! */
+ int current_sst;
++#if FX_GLIDE_I386
+ FxU32 CPUType;
+#endif
+ GrGC *curGC; /* point to the current GC */
+ FxU32 packerFixAddress; /* address to write packer fix to */
+ FxBool windowsInit; /* Is the Windows part of glide initialized? */
+@@ -3087,6 +3096,7 @@
+ va_list args);
+ #endif
- #define MAXFIFOSIZE 0x40000
- #define MAXFIFOSIZE_16MB 0xff000
-@@ -114,7 +120,7 @@
- char data[128];
- char *env, *val;
- envitem *item;
-- int first=1;
-+ int is_first=1;
++#if FX_GLIDE_I386
+ /* Returns 16:16 pair indicating the cpu's manufacturer and its
+ * capabilities. Non-Intel processors should have a vendor id w/ the
+ * high bit set so that it appears to be a negative #. The value of
+@@ -3119,6 +3129,7 @@
- if (envinit) return;
- envinit=1;
-@@ -126,9 +132,9 @@
- if (*data=='\n') continue;
- val=strchr(data, '=');
- if (!val) {
-- if (first) {
-+ if (is_first) {
- fprintf(stderr, "In config file /etc/conf.3dfx/voodoo3:\n");
-- first=0;
-+ is_first=0;
- }
- fprintf(stderr, "Malformed line: %s\n", data);
- continue;
-@@ -269,7 +275,7 @@
+ extern void GR_CDECL
+ double_precision_asm(void);
++#endif
- for (bAddr = 0; bAddr < HWC_NUM_BASE_ADDR; bAddr++) {
- if ((bAddrMask >> bAddr) & 0x1) {
-- bInfo->linearInfo.linearAddress[bAddr] = (FxU32)
-+ bInfo->linearInfo.linearAddress[bAddr] = (unsigned long)
- pciMapCardMulti(bInfo->pciInfo.vendorID, bInfo->pciInfo.deviceID,
- 0x2000000, &bInfo->deviceNum, bInfo->boardNum, bAddr);
- }
---- Glide3/h3/minihwc/minihwc.h.64bit 1999-11-24 22:45:07.000000000 +0100
-+++ Glide3/h3/minihwc/minihwc.h 2005-04-30 10:15:04.318757480 +0200
-@@ -238,22 +238,21 @@
- typedef struct hwcLinearInfo_s {
- FxBool
- initialized;
-- FxU32
-- linearAddress[HWC_NUM_BASE_ADDR];
-+ unsigned long linearAddress[HWC_NUM_BASE_ADDR];
- } hwcLinearInfo;
+ #ifdef GLIDE3
+ /*
+--- Glide3/cvg/glide3/src/makefile.linux.64bit 2000-07-12 23:33:31.000000000 +0200
++++ Glide3/cvg/glide3/src/makefile.linux 2005-05-04 17:05:03.000000000 +0200
+@@ -19,10 +19,16 @@
- typedef struct hwcRegInfo_s {
- FxBool
- initialized;
-- volatile FxU32
-- ioMemBase, /* mem base for I/O aliases */
-- cmdAGPBase, /* CMD/AGP register base */
-- waxBase, /* 2D register base */
-- sstBase, /* 3D register base */
-- lfbBase, /* 3D lfb base */
-- rawLfbBase; /* Raw LFB base (base address 1) */
-+ volatile unsigned long
-+ ioMemBase, /* mem base for I/O aliases */
-+ cmdAGPBase, /* CMD/AGP register base */
-+ waxBase, /* 2D register base */
-+ sstBase, /* 3D register base */
-+ lfbBase, /* 3D lfb base */
-+ rawLfbBase; /* Raw LFB base (base address 1) */
- #if __POWERPC__
-- ioPortBase; /* PPC does I/O via a 32-bit address */
-+ FxU32 ioPortBase; /* PPC does I/O via a 32-bit address */
- #else
- volatile FxU16
- ioPortBase, /* I/O base address */
---- Glide3/h3/minihwc/hwcext.h.64bit 1999-11-24 22:45:04.000000000 +0100
-+++ Glide3/h3/minihwc/hwcext.h 2005-04-30 10:15:04.308759000 +0200
-@@ -192,9 +192,8 @@
+ TAG_REGEXP = $(BUILD_ROOT)/$(FX_GLIDE_HW)/$(FX_HW_PROJECTS)/src/glide.rx
- /* Returned from HWCEXT_GETLINEARADDR */
- typedef struct hwcExtLinearAddrRes_s {
-- FxU32
-- numBaseAddrs, /* # base addresses */
-- baseAddresses[HWCEXT_MAX_BASEADDR]; /* linear Addresses */
-+ FxU32 numBaseAddrs; /* # base addresses */
-+ unsigned long baseAddresses[HWCEXT_MAX_BASEADDR]; /* linear Addresses */
- } hwcExtLinearAddrRes_t;
++ARCH := $(patsubst sparc64,sparc,$(patsubst i%86,i386,$(shell uname -m)))
++
+ # Compile for specific hardware
+ ifeq ($(FX_GLIDE_HW),cvg)
+ FX_GLIDE_REAL_HW= 1
++ifeq (i386,$(ARCH))
+ FX_GLIDE_CTRISETUP = 0
++else
++FX_GLIDE_CTRISETUP = 1
++endif
- /*
---- Glide3/h3/minihwc/linhwc.c.dri.64bit 2000-10-27 12:27:27.000000000 +0200
-+++ Glide3/h3/minihwc/linhwc.c.dri 2005-04-30 10:15:04.310758696 +0200
-@@ -67,7 +67,13 @@
- #include "lindri.h"
+ HWSPEC = fifo.c
+ LCDEFS += -DCVG \
+--- Glide3/cvg/glide3/src/gpci.c.64bit 1999-12-07 22:42:33.000000000 +0100
++++ Glide3/cvg/glide3/src/gpci.c 2005-05-04 17:05:03.000000000 +0200
+@@ -576,52 +576,41 @@
+ #endif
- static FxU32 fenceVar;
--#define P6FENCE asm("xchg %%eax, %0" : : "m" (fenceVar) : "eax");
-+#ifdef __ia64__
-+# define P6FENCE asm volatile("mf.a" ::: "memory");
-+#elif defined(__alpha__)
-+# define P6FENCE asm volatile("mb" ::: "memory");
-+#else
-+# define P6FENCE asm("xchg %%eax, %0" : : "m" (fenceVar) : "eax");
[...2975 lines suppressed...]
roff = r << NBITS;
--- Glide3/swlibs/texus/lib/texusint.h.64bit 2000-06-15 02:11:40.000000000 +0200
-+++ Glide3/swlibs/texus/lib/texusint.h 2005-04-30 10:15:04.416742584 +0200
++++ Glide3/swlibs/texus/lib/texusint.h 2005-05-04 17:05:03.000000000 +0200
@@ -67,7 +67,7 @@
int txAspectRatio(int w, int h);
void txPanic(char *);
@@ -3199,7 +3584,7 @@
FxBool _txReadTGAHeader( FILE *stream, FxU32 cookie, TxMip *info);
FxBool _txReadTGAData( FILE *stream, TxMip *info);
--- Glide3/swlibs/texus/lib/mipmap.c.64bit 2000-06-15 02:11:40.000000000 +0200
-+++ Glide3/swlibs/texus/lib/mipmap.c 2005-04-30 10:15:04.403744560 +0200
++++ Glide3/swlibs/texus/lib/mipmap.c 2005-05-04 17:05:03.000000000 +0200
@@ -35,7 +35,7 @@
#define B3(x) ((x>>0)&0xFF)
@@ -3210,7 +3595,7 @@
unsigned int i,j,k;
unsigned int w,h, *p,sum,*q;
--- Glide3/swlibs/texus/lib/quantize.c.64bit 2000-10-03 20:31:53.000000000 +0200
-+++ Glide3/swlibs/texus/lib/quantize.c 2005-04-30 10:15:04.411743344 +0200
++++ Glide3/swlibs/texus/lib/quantize.c 2005-05-04 17:05:03.000000000 +0200
@@ -39,7 +39,7 @@
static int errR[MAX_TEXWIDTH], errG[MAX_TEXWIDTH], errB[MAX_TEXWIDTH];
@@ -3426,7 +3811,7 @@
}
}
--- Glide3/swlibs/texus/lib/util.c.64bit 2000-06-15 02:11:40.000000000 +0200
-+++ Glide3/swlibs/texus/lib/util.c 2005-04-30 10:15:04.417742432 +0200
++++ Glide3/swlibs/texus/lib/util.c 2005-05-04 17:05:03.000000000 +0200
@@ -133,14 +133,14 @@
}
@@ -3456,7 +3841,7 @@
int i, d;
int mindist, minpos; // closest distance to input
--- Glide3/swlibs/texus/lib/texus.h.64bit 2000-06-15 02:11:40.000000000 +0200
-+++ Glide3/swlibs/texus/lib/texus.h 2005-04-30 10:15:04.414742888 +0200
++++ Glide3/swlibs/texus/lib/texus.h 2005-05-04 17:05:03.000000000 +0200
@@ -38,8 +38,13 @@
typedef unsigned char FxU8;
typedef unsigned short FxU16;
@@ -3472,7 +3857,7 @@
/*
--- Glide3/swlibs/texus/lib/nccnnet.c.64bit 2000-10-03 20:31:53.000000000 +0200
-+++ Glide3/swlibs/texus/lib/nccnnet.c 2005-04-30 10:15:04.407743952 +0200
++++ Glide3/swlibs/texus/lib/nccnnet.c 2005-05-04 17:05:03.000000000 +0200
@@ -88,19 +88,19 @@
#define MAX_NEURONS 256
@@ -3553,7 +3938,7 @@
}
else {
--- Glide3/swlibs/texus/lib/rgt.c.64bit 2000-06-15 02:11:40.000000000 +0200
-+++ Glide3/swlibs/texus/lib/rgt.c 2005-04-30 10:15:04.413743040 +0200
++++ Glide3/swlibs/texus/lib/rgt.c 2005-05-04 17:05:03.000000000 +0200
@@ -52,7 +52,7 @@
@@ -3591,7 +3976,7 @@
#endif
--- Glide3/swlibs/texus/lib/ncc.c.64bit 2000-10-03 20:31:53.000000000 +0200
-+++ Glide3/swlibs/texus/lib/ncc.c 2005-04-30 10:15:04.404744408 +0200
++++ Glide3/swlibs/texus/lib/ncc.c 2005-05-04 17:05:03.000000000 +0200
@@ -124,7 +124,7 @@
}
@@ -3611,7 +3996,7 @@
}
else {
--- Glide3/swlibs/texus/lib/dequant.c.64bit 2000-06-15 02:11:40.000000000 +0200
-+++ Glide3/swlibs/texus/lib/dequant.c 2005-04-30 10:15:04.401744864 +0200
++++ Glide3/swlibs/texus/lib/dequant.c 2005-05-04 17:05:03.000000000 +0200
@@ -160,12 +160,12 @@
}
@@ -3659,7 +4044,7 @@
break;
case GR_TEXFMT_ARGB_1555: _txImgDequantizeARGB1555(dst, src, w, h);
--- Glide3/swlibs/texus2/cmd/makefile.autoconf.am.64bit 2000-08-07 17:24:44.000000000 +0200
-+++ Glide3/swlibs/texus2/cmd/makefile.autoconf.am 2005-04-30 10:15:04.419742128 +0200
++++ Glide3/swlibs/texus2/cmd/makefile.autoconf.am 2005-05-04 17:05:03.000000000 +0200
@@ -24,5 +24,5 @@
noinst_PROGRAMS = texus
texus_SOURCES = cmd.c
@@ -3667,86 +4052,30 @@
- $(top_builddir)/swlibs/texus2/lib/libtexus.la
+ $(top_builddir)/swlibs/texus2/lib/libtexus.la -lm
---- Glide3/swlibs/fxmisc/fximg.c.64bit 2000-10-03 20:31:53.000000000 +0200
-+++ Glide3/swlibs/fxmisc/fximg.c 2005-04-30 10:15:04.392746232 +0200
-@@ -1948,7 +1948,7 @@
- if (prefix) { // if there's a path prefix
- char buf[1024], *p;
- strcpy(buf,prefix); // copy and replace semicolon
-- if ((p = strchr(buf,';'))) *p = '\0';
-+ if ((p = strchr(buf,';')) != NULL) *p = '\0';
- fprintf(stderr,buf);
- fprintf(stderr,"/");
- }
---- Glide3/swlibs/fxmisc/fxos.c.64bit 2000-10-03 20:31:53.000000000 +0200
-+++ Glide3/swlibs/fxmisc/fxos.c 2005-04-30 10:15:04.393746080 +0200
-@@ -98,7 +98,7 @@
-
- // first try and open up the file in the current directory
- if (pprefix) *pprefix = NULL;
-- if ((file = fopen(filename,mode)))
-+ if ((file = fopen(filename,mode)) != NULL)
- return file;
- if (path == NULL)
- return NULL;
-@@ -115,7 +115,7 @@
- strcat(nameWithPath,"/"); // add directory separator
- strcat(nameWithPath,filename); // add filename
- if (pprefix) *pprefix = path; // save the prefix
-- if ((file = fopen(nameWithPath,mode)))
-+ if ((file = fopen(nameWithPath,mode)) != NULL)
- return file;
- path = psemi; // advance to next path element
- if (path)
---- Glide3/cvg/init/sst1init.h.64bit 2005-04-30 10:15:20.011371840 +0200
-+++ Glide3/cvg/init/sst1init.h 2005-04-30 10:20:06.491820192 +0200
-@@ -146,9 +146,13 @@
- # define P6FENCE {_asm xchg eax, p6FenceVar}
- #elif defined(macintosh) && __POWERPC__ && defined(__MWERKS__)
- # define P6FENCE __eieio()
--#elif defined (__GNUC__) && defined(__i386__)
-+#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
- # define P6FENCE asm("xchg %%eax,%0" : /*outputs*/ : "m" (p6FenceVar) : \
- "eax");
-+#elif defined(__GNUC__) && defined(__ia64__)
-+# define P6FENCE asm volatile ("mf.a" ::: "memory");
-+#elif defined(__GNUC__) && defined(__alpha__)
-+# define P6FENCE asm volatile("mb" ::: "memory");
- #else
- # error "P6 Fencing in-line assembler code needs to be added for this compiler"
- #endif
---- Glide3/cvg/glide3/src/fxglide.h.64bit 2005-04-30 10:15:53.048349456 +0200
-+++ Glide3/cvg/glide3/src/fxglide.h 2005-04-30 10:19:34.853629928 +0200
-@@ -412,6 +412,13 @@
- #define P6FENCE p6Fence()
- #elif defined(__MSC__)
- #define P6FENCE {_asm xchg eax, p6FenceVar}
-+#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
-+# define P6FENCE asm("xchg %%eax,%0" : /*outputs*/ : "m" (p6FenceVar) : \
-+ "eax");
-+#elif defined(__GNUC__) && defined(__ia64__)
-+# define P6FENCE asm volatile ("mf.a" ::: "memory");
-+#elif defined(__GNUC__) && defined(__alpha__)
-+# define P6FENCE asm volatile("mb" ::: "memory");
- #else
- #error "P6 Fencing in-line assembler code needs to be added for this compiler"
- #endif /* Compiler specific fence commands */
---- Glide3/cvg/glide3/src/makefile.linux.64bit 2000-07-12 23:33:31.000000000 +0200
-+++ Glide3/cvg/glide3/src/makefile.linux 2005-04-30 10:15:04.247768272 +0200
-@@ -19,10 +19,16 @@
-
- TAG_REGEXP = $(BUILD_ROOT)/$(FX_GLIDE_HW)/$(FX_HW_PROJECTS)/src/glide.rx
-
-+ARCH := $(patsubst sparc64,sparc,$(patsubst i%86,i386,$(shell uname -m)))
-+
- # Compile for specific hardware
- ifeq ($(FX_GLIDE_HW),cvg)
- FX_GLIDE_REAL_HW= 1
-+ifeq (i386,$(ARCH))
- FX_GLIDE_CTRISETUP = 0
+--- Glide3/configure.in.64bit 2000-10-20 21:07:00.000000000 +0200
++++ Glide3/configure.in 2005-05-04 17:07:23.000000000 +0200
+@@ -171,7 +171,14 @@
+ GLIDE_SANITY_SIZE=false
+ FX_DLL_BUILD=false
+ FX_GLIDE_HW_CULL=false
+-FX_GLIDE_CTRISETUP=false
++ARCH=`uname -m | sed "s|[[456]]86|386|g"`
++if test "$ARCH" = "i386" ; then
++ FX_GLIDE_I386=true
++ FX_GLIDE_CTRISETUP=false
+else
-+FX_GLIDE_CTRISETUP = 1
-+endif
++ FX_GLIDE_I386=false
++ FX_GLIDE_CTRISETUP=true
++fi
+ # Next, we read some configuration options
+ # statically. This is to avoid creating a bunch of
+ # not-terribly-useful --enable options.
+@@ -215,6 +222,8 @@
+ test x$FX_GLIDE_VERTEX_TABLE = xtrue)
+ AM_CONDITIONAL(FX_HOOPTI_TRI_SETUP_COMPARE,dnl
+ test x$FX_HOOPTI_TRI_SETUP_COMPARE = xtrue)
++AM_CONDITIONAL(FX_GLIDE_I386,dnl
++ test x$FX_GLIDE_I386 = xtrue)
- HWSPEC = fifo.c
- LCDEFS += -DCVG \
+ dnl Checks for programs.
+ AC_PROG_CC
Glide3-fixes.patch:
Index: Glide3-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/Glide3/devel/Glide3-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Glide3-fixes.patch 30 Apr 2005 10:18:56 -0000 1.2
+++ Glide3-fixes.patch 4 May 2005 15:14:46 -0000 1.3
@@ -1,5 +1,5 @@
---- Glide3/cvg/init/makefile.autoconf.am.fix 2000-07-27 04:39:18.000000000 +0200
-+++ Glide3/cvg/init/makefile.autoconf.am 2004-09-04 11:53:34.000000000 +0200
+--- Glide3-fix/cvg/init/makefile.autoconf.am.fix 2005-05-04 16:12:55.000000000 +0200
++++ Glide3-fix/cvg/init/makefile.autoconf.am 2005-05-04 16:13:03.000000000 +0200
@@ -49,7 +49,7 @@
LDEFS = -DINIT_LINUX $(GLIDE_DEBUG_VDEFS)
@@ -9,8 +9,8 @@
libsst1init_la_SOURCES = sst1init.c info.c print.c parse.c \
gamma.c util.c sli.c video.c dac.c \
gdebug.c canopus.c
---- Glide3/cvg/glide3/src/g3df.c.fix 1999-12-07 22:42:32.000000000 +0100
-+++ Glide3/cvg/glide3/src/g3df.c 2004-09-04 11:53:34.000000000 +0200
+--- Glide3-fix/cvg/glide3/src/g3df.c.fix 2005-05-04 16:12:55.000000000 +0200
++++ Glide3-fix/cvg/glide3/src/g3df.c 2005-05-04 16:13:03.000000000 +0200
@@ -70,6 +70,7 @@
*/
#include <stdio.h>
@@ -32,8 +32,8 @@
}
#else
{
---- Glide3/cvg/glide3/src/distate.c.fix 1999-12-07 22:42:31.000000000 +0100
-+++ Glide3/cvg/glide3/src/distate.c 2004-09-04 11:53:34.000000000 +0200
+--- Glide3-fix/cvg/glide3/src/distate.c.fix 2005-05-04 16:12:55.000000000 +0200
++++ Glide3-fix/cvg/glide3/src/distate.c 2005-05-04 16:13:03.000000000 +0200
@@ -166,25 +166,25 @@
*/
@@ -67,9 +67,9 @@
/*-------------------------------------------------------------------
Function: grAlphaBlendFunction
---- Glide3/cvg/glide3/src/fxglide.h.fix 1999-12-07 22:42:31.000000000 +0100
-+++ Glide3/cvg/glide3/src/fxglide.h 2004-09-04 11:53:34.000000000 +0200
-@@ -1417,7 +1417,7 @@
+--- Glide3-fix/cvg/glide3/src/fxglide.h.fix 2005-05-04 16:12:55.000000000 +0200
++++ Glide3-fix/cvg/glide3/src/fxglide.h 2005-05-04 16:13:03.000000000 +0200
+@@ -1426,7 +1426,7 @@
#ifdef GLIDE3
#define GR_STATE_ENTRY(name, type, args) \
@@ -78,7 +78,7 @@
#else
#define GR_STATE_ENTRY(name, type, args) \
GR_ENTRY(name, type, args)
-@@ -2937,7 +2937,7 @@
+@@ -2946,7 +2946,7 @@
#define REG_GROUP_SETF_CLAMP(__regBase, __regAddr, __val) \
do { \
const FxU32 fpClampVal = FP_FLOAT_CLAMP(__val); \
@@ -87,7 +87,7 @@
SET(((FxU32*)(__regBase))[offsetof(SstRegs, __regAddr) >> 2], fpClampVal); \
GR_INC_SIZE(sizeof(FxU32)); \
} while(0)
-@@ -3339,17 +3339,17 @@
+@@ -3350,17 +3350,17 @@
#endif
#ifdef GLIDE3_DEBUG
@@ -108,8 +108,8 @@
#define G3_LOD_TRANSLATE(lod) (lod)
#define G3_ASPECT_TRANSLATE(aspect) (aspect)
#endif /* !(defined(GLIDE3) && defined(GLIDE3_ALPHA)) */
---- Glide3/cvg/glide3/src/makefile.autoconf.am.fix 2000-10-31 04:25:45.000000000 +0100
-+++ Glide3/cvg/glide3/src/makefile.autoconf.am 2004-09-04 11:53:34.000000000 +0200
+--- Glide3-fix/cvg/glide3/src/makefile.autoconf.am.fix 2005-05-04 16:38:29.000000000 +0200
++++ Glide3-fix/cvg/glide3/src/makefile.autoconf.am 2005-05-04 16:21:36.000000000 +0200
@@ -23,12 +23,6 @@
#
# First the variable definitions.
@@ -123,16 +123,24 @@
if GLIDE_DEBUG
DEBUG_VDEFS = -DGLIDE_DEBUG \
-DGDBG_INFO_ON \
-@@ -40,15 +34,22 @@
- GL_AMD3D_VDEFS = -DGL_AMD3D
+@@ -36,19 +30,30 @@
+ -DGLIDE_SANITY_ASSERT
+ endif
+
+-if GL_AMD3D
+-GL_AMD3D_VDEFS = -DGL_AMD3D
++if FX_GLIDE_I386
++FX_GLIDE_I386_VDEFS = -DFX_GLIDE_I386=1
endif
-if FX_GLIDE_HW_CULL
-FX_GLIDE_HW_VDEFS =
-else
-FX_GLIDE_HW_VDEFS = -DGLIDE_TRI_CULLING=1
--endif
--
++if GL_AMD3D
++GL_AMD3D_VDEFS = -DGL_AMD3D
+ endif
+
if FX_GLIDE_SW_SETUP
FX_GLIDE_SW_SETUP_VDEFS = -DGLIDE_HW_TRI_SETUP=0 \
-DGLIDE_TRI_CULLING=1
@@ -152,7 +160,7 @@
endif
if FX_GLIDE_CTRISETUP
-@@ -74,79 +75,106 @@
+@@ -74,79 +79,111 @@
FX_GLIDE_NO_SPLASH_VDEFS = -DGLIDE_SPLASH
endif
@@ -171,6 +179,7 @@
-include_HEADERS = glide.h
+VDEFS = $(HAL_HW_VDEFS) \
+ $(DEBUG_VDEFS) \
++ $(FX_GLIDE_I386_VDEFS) \
+ $(GL_AMD3D_VDEFS) \
+ $(FX_GLIDE_SW_SETUP_VDEFS) \
+ $(FX_HOOPTI_TRI_SETUP_COMPARE_VDEFS) \
@@ -207,6 +216,11 @@
+#
+# Library definitions.
+#
++if FX_GLIDE_I386
++FX_GLIDE_I386_SRC = cpudtect.S
++endif
++
++VGLIDE_SRC = $(FX_GLIDE_TRISETUP_SRC) $(FX_GLIDE_I386_SRC)
+
+WHOLE_LIBS = $(top_builddir)/swlibs/fxmisc/libfxmisc.la \
+ $(top_builddir)/swlibs/newpci/pcilib/libfxpci.la \
@@ -228,8 +242,7 @@
gglide.c glfb.c gsst.c gtex.c gtexdl.c\
fifo.c gstrip.c distrip.c distate.c diget.c \
- xtexdl.c cpudtect.s
-+ xtexdl.c cpudtect.S \
-+ $(FX_GLIDE_TRISETUP_SRC)
++ xtexdl.c $(VGLIDE_SRC)
+
+libglide3_la_LDFLAGS = -version-info 13:0:10
+libglide3_la_LIBADD = $(WHOLE_LIBS) $(LINK_LIBS)
@@ -306,9 +319,9 @@
xdraw2_def.o xdraw3_def.o xtexdl_def.o: fxinline.h
xdraw2_def.lo xdraw3_def.lo xtexdl_def.lo: fxinline.h
xdraw2_3dnow.o xdraw3_3dnow.o xtexdl_3dnow.o: fxgasm.h
---- Glide3/h3/glide3/src/makefile.autoconf.am.fix 2004-09-04 11:53:34.000000000 +0200
-+++ Glide3/h3/glide3/src/makefile.autoconf.am 2004-09-04 11:53:34.000000000 +0200
-@@ -94,16 +94,12 @@
+--- Glide3-fix/h3/glide3/src/makefile.autoconf.am.fix 2005-05-04 16:41:37.000000000 +0200
++++ Glide3-fix/h3/glide3/src/makefile.autoconf.am 2005-05-04 16:15:21.000000000 +0200
+@@ -98,16 +98,12 @@
else
FX_GLIDE_CTRISETUP_SRC =
if GL_AMD3D
@@ -327,7 +340,7 @@
VDEFS = $(FX_CHRIS_DENIS_ANTHONY_HACK_VDEFS) \
$(FX_GLIDE_ALT_TAB_VDEFS) \
$(FX_GLIDE_DIRECT_WRITE_VDEFS) \
-@@ -138,33 +134,21 @@
+@@ -143,33 +139,21 @@
#
# Special rules for assembly files.
#
@@ -371,17 +384,17 @@
if DRI_BUILD
gglide.c: $(top_srcdir)/h3/glide3/src/gglide.c.dri
-@@ -219,7 +203,7 @@
+@@ -228,7 +212,7 @@
gglide.c distate.c gstrip.c distrip.c \
diget.c glfb.c gsst.c gtex.c gtexdl.c \
- fifo.c xtexdl_def.c cpudtect.S \
+ fifo.c xtexdl_def.c \
- $(VGLIDE_SRC) $(ASMTRISETUP) $(GL_AMD3D_SRC)
+ $(VGLIDE_SRC) $(ASMTRISETUP)
libglide3_la_LDFLAGS = -version-info 13:0:10
libglide3_la_LIBADD = $(WHOLE_LIBS) $(LINK_LIBS)
---- Glide3/h3/glide3/src/distate.c.fix 2000-11-24 19:36:48.000000000 +0100
-+++ Glide3/h3/glide3/src/distate.c 2004-09-04 11:53:34.000000000 +0200
+--- Glide3-fix/h3/glide3/src/distate.c.fix 2005-05-04 16:12:55.000000000 +0200
++++ Glide3-fix/h3/glide3/src/distate.c 2005-05-04 16:13:03.000000000 +0200
@@ -203,23 +203,23 @@
*/
@@ -412,9 +425,9 @@
/*-------------------------------------------------------------------
Function: grAlphaBlendFunction
---- Glide3/h3/glide3/src/fxglide.h.fix 2000-11-24 19:36:48.000000000 +0100
-+++ Glide3/h3/glide3/src/fxglide.h 2004-09-04 11:53:34.000000000 +0200
-@@ -1512,7 +1512,7 @@
+--- Glide3-fix/h3/glide3/src/fxglide.h.fix 2005-05-04 16:12:55.000000000 +0200
++++ Glide3-fix/h3/glide3/src/fxglide.h 2005-05-04 16:13:03.000000000 +0200
+@@ -1519,7 +1519,7 @@
#ifdef GLIDE3
#define GR_STATE_ENTRY(name, type, args) \
@@ -423,7 +436,7 @@
#else
#define GR_STATE_ENTRY(name, type, args) \
GR_ENTRY(name, type, args)
-@@ -1831,7 +1831,7 @@
+@@ -1838,7 +1838,7 @@
#define CUR_TRI_PROC(__checkValidP, __cullP) \
(*gc->archDispatchProcs.coorModeTriVector)[__checkValidP][__cullP]
#define INVALIDATE(regset) {\
@@ -432,17 +445,17 @@
gc->triSetupProc = CUR_TRI_PROC(FXTRUE, (gc->state.cull_mode != GR_CULL_DISABLE)); \
}
---- Glide3/h3/glide3/src/g3df.c.fix 1999-11-24 22:44:56.000000000 +0100
-+++ Glide3/h3/glide3/src/g3df.c 2004-09-04 11:53:34.000000000 +0200
-@@ -72,6 +72,7 @@
- */
+--- Glide3-fix/h3/glide3/src/g3df.c.fix 2005-05-04 16:12:55.000000000 +0200
++++ Glide3-fix/h3/glide3/src/g3df.c 2005-05-04 16:13:03.000000000 +0200
+@@ -73,6 +73,7 @@
+ #include <ctype.h>
#include <stdio.h>
#include <string.h>
+#include <ctype.h>
#include <3dfx.h>
#define FX_DLL_DEFINITION
-@@ -401,7 +402,11 @@
+@@ -402,7 +403,11 @@
/* This function is not found in libgcc.a */
{
char* tempStr = (char*)color_format;
@@ -455,8 +468,8 @@
}
#else
{
---- Glide3/h3/glide3/src/fxcmd.h.fix 1999-11-24 22:44:55.000000000 +0100
-+++ Glide3/h3/glide3/src/fxcmd.h 2004-09-04 11:53:34.000000000 +0200
+--- Glide3-fix/h3/glide3/src/fxcmd.h.fix 2005-05-04 16:12:55.000000000 +0200
++++ Glide3-fix/h3/glide3/src/fxcmd.h 2005-05-04 16:13:03.000000000 +0200
@@ -1312,7 +1312,7 @@
#define REG_GROUP_SETF_CLAMP(__regBase, __regAddr, __val) \
do { \
@@ -466,9 +479,9 @@
SET(((FxU32*)(__regBase))[offsetof(SstRegs, __regAddr) >> 2], fpClampVal); \
GR_INC_SIZE(sizeof(FxU32)); \
} while(0)
---- Glide3/h3/minihwc/linhwc.c.dri.fix 2000-10-27 12:27:27.000000000 +0200
-+++ Glide3/h3/minihwc/linhwc.c.dri 2004-09-04 11:53:34.000000000 +0200
-@@ -76,6 +76,13 @@
+--- Glide3-fix/h3/minihwc/linhwc.c.dri.fix 2005-05-04 16:12:55.000000000 +0200
++++ Glide3-fix/h3/minihwc/linhwc.c.dri 2005-05-04 16:13:03.000000000 +0200
+@@ -82,6 +82,13 @@
#define HWC_TILED_BUFFER_Y_ALIGN 0x20000UL
#define HWC_TILED_BUFFER_X_ADJUST 0x80UL
@@ -482,7 +495,7 @@
static hwcInfo hInfo;
static char errorString[1024];
-@@ -83,6 +90,7 @@
+@@ -89,6 +96,7 @@
static FxU32 calcBufferSize(FxU32 xres, FxU32 yres, FxBool tiled);
static FxU32 calcBufferSizeInTiles(FxU32 xres, FxU32 yres);
static FxU32 calcBufferHeightInTiles(FxU32 yres);
@@ -490,9 +503,9 @@
typedef struct envitem_t {
char *env;
---- Glide3/h5/glide3/src/makefile.autoconf.am.fix 2004-09-04 11:53:34.000000000 +0200
-+++ Glide3/h5/glide3/src/makefile.autoconf.am 2004-09-04 11:53:34.000000000 +0200
-@@ -152,41 +152,35 @@
+--- Glide3-fix/h5/glide3/src/makefile.autoconf.am.fix 2005-05-04 16:12:55.000000000 +0200
++++ Glide3-fix/h5/glide3/src/makefile.autoconf.am 2005-05-04 16:13:03.000000000 +0200
+@@ -157,41 +157,35 @@
#
# Special rules for assembly files.
#
@@ -541,7 +554,7 @@
$(RM) -f $*.tmp.s
#
-@@ -196,7 +186,7 @@
+@@ -201,7 +195,7 @@
FX_GLIDE_CTRISETUP_SRC = gxdraw.c
else
if GL_AMD3D
@@ -550,9 +563,9 @@
else
FX_GLIDE_CTRISETUP_SRC = xdraw2_def.s xdraw3_def.s
endif
---- Glide3/h5/glide3/src/fxglide.h.fix 2000-11-24 19:36:47.000000000 +0100
-+++ Glide3/h5/glide3/src/fxglide.h 2004-09-04 11:53:34.000000000 +0200
-@@ -2119,7 +2119,7 @@
+--- Glide3-fix/h5/glide3/src/fxglide.h.fix 2005-05-04 16:12:55.000000000 +0200
++++ Glide3-fix/h5/glide3/src/fxglide.h 2005-05-04 16:13:03.000000000 +0200
+@@ -2121,7 +2121,7 @@
#ifdef GLIDE3
#define GR_STATE_ENTRY(name, type, args) \
@@ -561,7 +574,7 @@
#else
#define GR_STATE_ENTRY(name, type, args) \
GR_ENTRY(name, type, args)
-@@ -2626,13 +2626,13 @@
+@@ -2628,13 +2628,13 @@
#define CUR_TRI_PROC(__checkValidP, __cullP) \
(*gc->archDispatchProcs.coorModeTriVector)[__checkValidP][__cullP]
#define INVALIDATE(regset) {\
@@ -577,8 +590,8 @@
}
void
---- Glide3/h5/glide3/src/distate.c.fix 2000-11-24 19:36:47.000000000 +0100
-+++ Glide3/h5/glide3/src/distate.c 2004-09-04 11:53:34.000000000 +0200
+--- Glide3-fix/h5/glide3/src/distate.c.fix 2005-05-04 16:12:55.000000000 +0200
++++ Glide3-fix/h5/glide3/src/distate.c 2005-05-04 16:13:03.000000000 +0200
@@ -349,31 +349,31 @@
*/
@@ -620,17 +633,17 @@
/*-------------------------------------------------------------------
Function: grAlphaBlendFunction
---- Glide3/h5/glide3/src/g3df.c.fix 2000-11-16 00:32:53.000000000 +0100
-+++ Glide3/h5/glide3/src/g3df.c 2004-09-04 11:53:34.000000000 +0200
-@@ -101,6 +101,7 @@
- */
+--- Glide3-fix/h5/glide3/src/g3df.c.fix 2005-05-04 16:12:55.000000000 +0200
++++ Glide3-fix/h5/glide3/src/g3df.c 2005-05-04 16:13:03.000000000 +0200
+@@ -102,6 +102,7 @@
+ #include <ctype.h>
#include <stdio.h>
#include <string.h>
+#include <ctype.h>
#include <3dfx.h>
#define FX_DLL_DEFINITION
-@@ -476,7 +477,11 @@
+@@ -477,7 +478,11 @@
/* This function is not found in libgcc.a */
{
char* tempStr = (char*)color_format;
@@ -643,8 +656,8 @@
}
#else
{
---- Glide3/h5/glide3/src/gglide.c.fix 2004-09-07 11:54:18.939373784 +0200
-+++ Glide3/h5/glide3/src/gglide.c 2004-09-07 11:55:00.657031736 +0200
+--- Glide3-fix/h5/glide3/src/gglide.c.fix 2005-05-04 16:12:55.000000000 +0200
++++ Glide3-fix/h5/glide3/src/gglide.c 2005-05-04 16:13:03.000000000 +0200
@@ -2903,6 +2903,11 @@
GR_END();
#undef FN_NAME
@@ -657,8 +670,8 @@
#endif /* defined(__linux__) */
/*---------------------------------------------------------------------------
---- Glide3/swlibs/fxmisc/fxos.c.fix 2000-10-03 20:31:53.000000000 +0200
-+++ Glide3/swlibs/fxmisc/fxos.c 2004-09-04 11:53:34.000000000 +0200
+--- Glide3-fix/swlibs/fxmisc/fxos.c.fix 2005-05-04 16:12:55.000000000 +0200
++++ Glide3-fix/swlibs/fxmisc/fxos.c 2005-05-04 16:13:03.000000000 +0200
@@ -24,6 +24,7 @@
#include <stdio.h>
#include <stdlib.h>
@@ -667,8 +680,8 @@
#ifdef WIN32
#include <windows.h>
---- Glide3/swlibs/include/make/3dfx.linux.mak.fix 2000-07-12 23:35:28.000000000 +0200
-+++ Glide3/swlibs/include/make/3dfx.linux.mak 2004-09-04 11:53:34.000000000 +0200
+--- Glide3-fix/swlibs/include/make/3dfx.linux.mak.fix 2005-05-04 16:12:55.000000000 +0200
++++ Glide3-fix/swlibs/include/make/3dfx.linux.mak 2005-05-04 16:13:03.000000000 +0200
@@ -77,7 +77,7 @@
DEBUGDEFS = -DGDBG_INFO_ON -DGLIDE_DEBUG
GCDEFS = -DENDB -DX11
@@ -687,8 +700,8 @@
-fexpensive-optimizations -ffast-math -DBIG_OPT
CDEBUG = -g -O
---- Glide3/swlibs/include/make/makefile.autoconf.bottom.fix 2000-08-07 17:24:44.000000000 +0200
-+++ Glide3/swlibs/include/make/makefile.autoconf.bottom 2004-09-04 11:53:34.000000000 +0200
+--- Glide3-fix/swlibs/include/make/makefile.autoconf.bottom.fix 2005-05-04 16:12:55.000000000 +0200
++++ Glide3-fix/swlibs/include/make/makefile.autoconf.bottom 2005-05-04 16:13:03.000000000 +0200
@@ -51,11 +51,11 @@
GLIDE_DEBUG_GCFLAGS = -g -O
GLIDE_DEBUG_GDEFS = -DGDBG_INFO_ON -DGLIDE_DEBUG
@@ -720,8 +733,8 @@
-I$(top_srcdir)/h3/incsrc \
-I$(top_srcdir)/h3/minihwc
endif
---- Glide3/swlibs/include/make/3dfx.mak.fix 2000-10-03 20:25:35.000000000 +0200
-+++ Glide3/swlibs/include/make/3dfx.mak 2004-09-04 11:53:34.000000000 +0200
+--- Glide3-fix/swlibs/include/make/3dfx.mak.fix 2005-05-04 16:12:55.000000000 +0200
++++ Glide3-fix/swlibs/include/make/3dfx.mak 2005-05-04 16:13:03.000000000 +0200
@@ -110,7 +110,7 @@
DEBUGDEFS = -DGDBG_INFO_ON -DGLIDE_DEBUG
GCDEFS = -DENDB -DX11
@@ -740,8 +753,8 @@
-fexpensive-optimizations -ffast-math -DBIG_OPT
CDEBUG = -g -O
---- Glide3/swlibs/newpci/pcilib/fxpci.c.fix 2000-11-27 10:49:33.000000000 +0100
-+++ Glide3/swlibs/newpci/pcilib/fxpci.c 2004-09-04 11:53:34.000000000 +0200
+--- Glide3-fix/swlibs/newpci/pcilib/fxpci.c.fix 2005-05-04 16:12:55.000000000 +0200
++++ Glide3-fix/swlibs/newpci/pcilib/fxpci.c 2005-05-04 16:13:03.000000000 +0200
@@ -469,7 +469,7 @@
*/
@@ -762,8 +775,8 @@
continue;
if (deviceID == 0xFFFF) /* if special value */
---- Glide3/swlibs/texus2/lib/makefile.autoconf.am.fix 2000-08-25 19:33:26.000000000 +0200
-+++ Glide3/swlibs/texus2/lib/makefile.autoconf.am 2004-09-04 11:53:34.000000000 +0200
+--- Glide3-fix/swlibs/texus2/lib/makefile.autoconf.am.fix 2005-05-04 16:12:55.000000000 +0200
++++ Glide3-fix/swlibs/texus2/lib/makefile.autoconf.am 2005-05-04 16:13:03.000000000 +0200
@@ -33,6 +33,7 @@
noinst_LTLIBRARIES = libtexus.la
noinst_HEADERS = texusint.h
Glide3-new-autotools-bugfix.patch:
Index: Glide3-new-autotools-bugfix.patch
===================================================================
RCS file: /cvs/extras/rpms/Glide3/devel/Glide3-new-autotools-bugfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Glide3-new-autotools-bugfix.patch 28 Apr 2005 18:39:19 -0000 1.1
+++ Glide3-new-autotools-bugfix.patch 4 May 2005 15:14:46 -0000 1.2
@@ -1,8 +1,6 @@
-Fixup for new autotools for rawhide. <mharris at redhat.com>
-
---- h3/glide3/src/makefile.autoconf.am.new-autotools-bugfix Wed May 29 11:54:04 2002
-+++ h3/glide3/src/makefile.autoconf.am Wed May 29 11:55:46 2002
-@@ -208,7 +208,8 @@
+--- Glide3-fix/h3/glide3/src/makefile.autoconf.am.new-autotools-bugfix 2005-05-04 16:08:57.000000000 +0200
++++ Glide3-fix/h3/glide3/src/makefile.autoconf.am 2005-05-04 16:09:10.000000000 +0200
+@@ -217,7 +217,8 @@
noinst_HEADERS = fxglide.h gsstdef.h gsfc.h \
fxcmd.h fxsplash.h tv.h rcver.h qmodes.h \
macglide3.h
@@ -12,9 +10,9 @@
lib_LTLIBRARIES = libglide3.la
libglide3_la_SOURCES = fxinline.h fxgasm.h \
---- h5/glide3/src/makefile.autoconf.am.new-autotools-bugfix Wed May 29 11:56:58 2002
-+++ h5/glide3/src/makefile.autoconf.am Wed May 29 11:58:15 2002
-@@ -221,8 +221,8 @@
+--- Glide3-fix/h5/glide3/src/makefile.autoconf.am.new-autotools-bugfix 2005-05-04 16:08:57.000000000 +0200
++++ Glide3-fix/h5/glide3/src/makefile.autoconf.am 2005-05-04 16:09:10.000000000 +0200
+@@ -230,8 +230,8 @@
gsfc.h gsstdef.h \
qmodes.h tv.h \
fxgasm.h fxinline.h
Index: Glide3.spec
===================================================================
RCS file: /cvs/extras/rpms/Glide3/devel/Glide3.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Glide3.spec 2 May 2005 13:51:46 -0000 1.4
+++ Glide3.spec 4 May 2005 15:14:46 -0000 1.5
@@ -49,7 +49,7 @@
%prep
%setup -q -n Glide3
%patch0 -p1 -b .64bit
-%patch1 -p0 -b .new-autotools-bugfix
+%patch1 -p1 -b .new-autotools-bugfix
%patch2 -p1 -b .redhat-cleanup-1
%patch3 -p1 -b .fix
%patch4 -p1 -b .gcc4
@@ -62,11 +62,11 @@
automake-1.4 -a
autoconf
-#%ifarch %{ix86}
-#%define configure_flags --enable-fx-debug=no --enable-amd3d
-#%else
+%ifarch %{ix86}
+%define configure_flags --enable-fx-debug=no --enable-amd3d
+%else
%define configure_flags --enable-fx-debug=no
-#%endif
+%endif
mkdir build-5
cd build-5
@@ -156,6 +156,13 @@
%changelog
+* Mon May 4 2005 Hans de Goede <j.w.r.degoede at hhs.nl>
+- Tested amd3dnow code on a voodoo2, works for me (tm). Enabled
+ amd3dnow code on i386 for now.
+- Added FX_GLIDE_I386 AM-conditonal and define, only use and build
+ cpudtect.s when this is set. This should fix the cpudtect assemble problem
+ on x86_64. Made this part of Glide-64bit.patch.
+
* Mon May 2 2005 Hans de Goede <j.w.r.degoede at hhs.nl>
- Fix amd3dnow code for cvg(voodoo2) so that it not only compiles but
also links. Still untested, so still disabled.
More information about the fedora-extras-commits
mailing list