From 5b2cccf44f93ac0bb77bc33382598e08c50c9b3e Mon Sep 17 00:00:00 2001 From: alanh <> Date: Tue, 3 Oct 2000 08:18:09 +0000 Subject: [PATCH] merge trunk into Glide3-64bit branch. --- glide3x/chores.3dfx | 2 +- glide3x/h3/glide3/src/fxglide.h | 5 ++++- glide3x/h3/minihwc/linhwc.c.dri | 2 +- glide3x/h5/glide3/src/fxglide.h | 3 +-- glide3x/h5/glide3/src/makefile.autoconf.am | 20 ++++++++++---------- glide3x/h5/glide3/src/makefile.linux | 2 +- glide3x/h5/glide3/src/xtexdl_def.c | 1 - glide3x/h5/minihwc/linhwc.c | 2 +- swlibs/include/make/3dfx.mak | 2 +- swlibs/include/make/makefile.autoconf.bottom | 2 +- 10 files changed, 21 insertions(+), 20 deletions(-) diff --git a/glide3x/chores.3dfx b/glide3x/chores.3dfx index 2d7536b..368ce1d 100755 --- a/glide3x/chores.3dfx +++ b/glide3x/chores.3dfx @@ -214,7 +214,7 @@ if [ "$DO_CONFIGURE" = YES ] ; then # Now, make a build directory, and configure in it. # echo -n "Making build directory $BUILD_DIRECTORY..." - mkdir $BUILD_DIRECTORY + mkdir -p $BUILD_DIRECTORY echo 'Done' fi # diff --git a/glide3x/h3/glide3/src/fxglide.h b/glide3x/h3/glide3/src/fxglide.h index 816df4e..d192f2f 100644 --- a/glide3x/h3/glide3/src/fxglide.h +++ b/glide3x/h3/glide3/src/fxglide.h @@ -19,6 +19,9 @@ ** ** $Header$ ** $Log$ +** Revision 1.1.1.1.2.1 2000/08/30 08:47:03 alanh +** Changes for Voodoo3 for 64bit architectures +** ** Revision 1.1.1.1 1999/11/24 21:44:56 joseph ** Initial checkin for SourceForge ** @@ -1479,7 +1482,7 @@ extern GrGCFuncs _curGCFuncs; #elif defined(__GNUC__) && defined(__ia64__) #define P6FENCE asm volatile("mf.a" ::: "memory") #elif defined(__GNUC__) && defined(__alpha__) -#define P6FENCE +#define P6FENCE asm volatile("mb" ::: "memory") #else /* !defined ( P6FENCE ) */ # error "P6 Fencing code needs to be added for this compiler" #endif /* !defined ( P6FENCE ) */ diff --git a/glide3x/h3/minihwc/linhwc.c.dri b/glide3x/h3/minihwc/linhwc.c.dri index d249c05..4b78417 100644 --- a/glide3x/h3/minihwc/linhwc.c.dri +++ b/glide3x/h3/minihwc/linhwc.c.dri @@ -70,7 +70,7 @@ static FxU32 fenceVar; #ifdef __ia64__ #define P6FENCE asm volatile("mf.a" ::: "memory"); #elif __alpha__ -#define P6FENCE +#define P6FENCE asm volatile("mb" ::: "memory"); #elif __i386__ #define P6FENCE asm("xchg %%eax, %0" : : "m" (fenceVar) : "eax"); #elif diff --git a/glide3x/h5/glide3/src/fxglide.h b/glide3x/h5/glide3/src/fxglide.h index 6b6c1b2..f8026be 100644 --- a/glide3x/h5/glide3/src/fxglide.h +++ b/glide3x/h5/glide3/src/fxglide.h @@ -2088,8 +2088,7 @@ extern GrGCFuncs _curGCFuncs; */ #define P6FENCE asm("xchg %%eax, %0" : : "m" (_GlideRoot.p6Fencer) : "eax"); #elif defined(__GNUC__) && defined(__alpha__) -/* This might need to be a memory barrier on alpha - we'll see */ -#define P6FENCE +#define P6FENCE asm volatile("mb" ::: "memory") #elif defined(__GNUC__) && defined(__ia64__) #define P6FENCE asm volatile("mf.a" ::: "memory") #else /* !defined ( P6FENCE ) */ diff --git a/glide3x/h5/glide3/src/makefile.autoconf.am b/glide3x/h5/glide3/src/makefile.autoconf.am index ba0b36c..c57a07a 100644 --- a/glide3x/h5/glide3/src/makefile.autoconf.am +++ b/glide3x/h5/glide3/src/makefile.autoconf.am @@ -230,16 +230,16 @@ noinst_HEADERS = fxcmd.h fxsplash.h \ fxgasm_SOURCES = fxgasm.c gthread.c fxgasm_DEPENDENCIES = gthread.lo -lib_LTLIBRARIES = libglide3x.la -libglide3x_la_SOURCES = fxinline.h fxgasm.h \ - gsplash.c g3df.c gu.c gthread.c \ - gpci.c diglide.c disst.c ditex.c \ - gbanner.c gerror.c gaa.c gdraw.c \ - gglide.c distate.c gstrip.c distrip.c \ - diget.c glfb.c gsst.c gtex.c gtexdl.c \ - fifo.c $(CPUSOURCES) $(VGLIDE_SRC) -libglide3x_la_LDFLAGS = -version-info 13:0:10 -libglide3x_la_LIBADD = $(WHOLE_LIBS) $(LINK_LIBS) +lib_LTLIBRARIES = libglide3.la +libglide3_la_SOURCES = fxinline.h fxgasm.h \ + gsplash.c g3df.c gu.c gthread.c \ + gpci.c diglide.c disst.c ditex.c \ + gbanner.c gerror.c gaa.c gdraw.c \ + gglide.c distate.c gstrip.c distrip.c \ + diget.c glfb.c gsst.c gtex.c gtexdl.c \ + fifo.c cpudtect.s $(VGLIDE_SRC) +libglide3_la_LDFLAGS = -version-info 13:0:10 +libglide3_la_LIBADD = $(WHOLE_LIBS) $(LINK_LIBS) #--------------------------------------------------------------------------# # special rules for making fxgasm.h, fxinclude.h diff --git a/glide3x/h5/glide3/src/makefile.linux b/glide3x/h5/glide3/src/makefile.linux index 5a18080..677f682 100644 --- a/glide3x/h5/glide3/src/makefile.linux +++ b/glide3x/h5/glide3/src/makefile.linux @@ -227,7 +227,7 @@ OTHER_CFILES = fxgasm.c fxbldno.c fxinline.h # targets LDIRT = fxgasm.o fxgasm fxgasm.h fxinline.h fxbldno.o fxbldno fxbldno.h -LIBRARIES = libglide3x.a +LIBRARIES = libglide3.a SHARED_LIBRARY = libglide3.so.3.10 SUBLIBRARIES = $(BUILD_ROOT_SWLIBS)/lib/libfxmisc.a \ $(BUILD_ROOT_SWLIBS)/lib/libfxpci.a \ diff --git a/glide3x/h5/glide3/src/xtexdl_def.c b/glide3x/h5/glide3/src/xtexdl_def.c index 1e60eea..82426c0 100644 --- a/glide3x/h5/glide3/src/xtexdl_def.c +++ b/glide3x/h5/glide3/src/xtexdl_def.c @@ -601,7 +601,6 @@ _grTexDownload_Default_32_WideS(struct GrGC_s* gc, const FxU32 tmuBaseAddr, FxI32 s; - LINEAR_WRITE_BEGIN(maxS, PACKET5_MODE, (FxU32)tex_address, 0x00UL, 0x00UL); for (s = 0; s < maxS; s += 2) { diff --git a/glide3x/h5/minihwc/linhwc.c b/glide3x/h5/minihwc/linhwc.c index eeba7e1..a9f47d5 100644 --- a/glide3x/h5/minihwc/linhwc.c +++ b/glide3x/h5/minihwc/linhwc.c @@ -69,7 +69,7 @@ static FxU32 fenceVar; #if defined(__i386__) #define P6FENCE asm("xchg %%eax, %0" : : "m" (fenceVar) : "eax"); #elif defined(__alpha__) -#define P6FENCE +#define P6FENCE asm volatile("mb" ::: "memory") #elif defined(__ia64__) #define P6FENCE asm volatile("mf.a" ::: "memory") #elif diff --git a/swlibs/include/make/3dfx.mak b/swlibs/include/make/3dfx.mak index e18c768..6cef4a6 100644 --- a/swlibs/include/make/3dfx.mak +++ b/swlibs/include/make/3dfx.mak @@ -50,7 +50,7 @@ endif # determine the OS type # ifeq ($(SCRIPTDIR),) -SCRIPTDIR=/home/tools/scripts +SCRIPTDIR=$(TOPDIR)/swlibs/include/make/ endif OS=$(shell $(SCRIPTDIR)/ostype) ifeq ($(OS),) diff --git a/swlibs/include/make/makefile.autoconf.bottom b/swlibs/include/make/makefile.autoconf.bottom index c7219fa..3d04279 100644 --- a/swlibs/include/make/makefile.autoconf.bottom +++ b/swlibs/include/make/makefile.autoconf.bottom @@ -52,7 +52,7 @@ GLIDE_DEBUG_GCFLAGS = -g -O GLIDE_DEBUG_GDEFS = -DGDBG_INFO_ON -DGLIDE_DEBUG else ifeq ("@FX_GLIDE_BUILD_ARCHITECTURE@","alpha") -GLIDE_DEBUG_GCFLAGS = -O2 -mcpu=ev6 +GLIDE_DEBUG_GCFLAGS = -O2 -mcpu=ev6 GLIDE_DEBUG_GDEFS = -DBIG_OPT else ifeq ("@FX_GLIDE_BUILD_ARCHITECTURE@","ia64")