chacha/glide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

merge trunk into Glide3-64bit branch.

Browse Source
This commit is contained in:
alanh
2000-10-03 08:18:09 +00:00
parent 3f90077226
commit 5b2cccf44f
10 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
glide3x/chores.3dfx
View File

@@ -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
#

5
glide3x/h3/glide3/src/fxglide.h
View File

@@ -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 ) */

2
glide3x/h3/minihwc/linhwc.c.dri
View File

@@ -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

3
glide3x/h5/glide3/src/fxglide.h
View File

@@ -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 ) */

20
glide3x/h5/glide3/src/makefile.autoconf.am
View File

@@ -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

2
glide3x/h5/glide3/src/makefile.linux
View File

@@ -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 \

1
glide3x/h5/glide3/src/xtexdl_def.c
View File

@@ -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) {

2
glide3x/h5/minihwc/linhwc.c
View File

@@ -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

2
swlibs/include/make/3dfx.mak
View File

@@ -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),)

2
swlibs/include/make/makefile.autoconf.bottom
View File

@@ -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")