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

merge trunk into 64bit branch.

Browse Source
This commit is contained in:
alanh
2000-11-18 14:37:45 +00:00
parent 5345122667
commit c025951e50
6 changed files with 65 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
glide3x/h5/glide3/src/cpudtect.s
View File

@@ -20,10 +20,17 @@
/* $Header$ *
/* $Log$
/* Revision 1.4 2000/11/17 21:31:05 joseph
/* Restored changes that were lost when I imported new sources from 3dfx's
/* internal source repository.
/*
/* Revision 1.3 2000/11/15 23:32:52 joseph
/* Syncing up with 3dfx internal source repository. These changes contain a
/* number of bug fixes.
/*
/* Revision 1.2.2.3 2000/11/16 20:01:29 alanh
/* merge trunk into 64bit branch.
/*
/* Revision 1.2.2.2 2000/11/16 19:32:33 alanh
/* merge trunk into 64bit branch.
/*

15
glide3x/h5/glide3/src/glfb.c
View File

@@ -699,8 +699,16 @@ GR_ENTRY(grLfbLock, FxBool,(GrLock_t type, GrBuffer_t buffer,
else {
info->lfbPtr = (void *)gc->lfb_ptr;
#ifdef __linux__
info->strideInBytes = 0x1000;
#endif /* defined(__linux__) */
/*
* For Linux, we just return the correct address and
* stride.
*/
info->strideInBytes = gc->bInfo->buffInfo.bufLfbStride;
info->lfbPtr = (void *)gc->lfbBuffers[colBufferIndex];
#else /* defined(__linux__) */
info->lfbPtr = (void *)gc->lfb_ptr;
#endif /* defined(__linux__) */
#ifndef __linux__
switch (writeMode) {
case GR_LFBWRITEMODE_565_DEPTH:
case GR_LFBWRITEMODE_555_DEPTH:
@@ -711,6 +719,7 @@ GR_ENTRY(grLfbLock, FxBool,(GrLock_t type, GrBuffer_t buffer,
info->strideInBytes <<= 1;
break;
}
#endif /* defined(__linux__) */
}
REG_GROUP_BEGIN(BROADCAST_ID, colBufferAddr, 2, 0x3);
REG_GROUP_SET(hw, colBufferAddr, gc->textureBuffer.addr );
@@ -771,6 +780,7 @@ GR_ENTRY(grLfbLock, FxBool,(GrLock_t type, GrBuffer_t buffer,
info->lfbPtr = (void *)gc->lfb_ptr;
#ifndef __linux__
switch (writeMode) {
case GR_LFBWRITEMODE_565_DEPTH:
case GR_LFBWRITEMODE_555_DEPTH:
@@ -781,6 +791,7 @@ GR_ENTRY(grLfbLock, FxBool,(GrLock_t type, GrBuffer_t buffer,
info->strideInBytes <<= 1;
break;
}
#endif /* defined(__linux__) */
}
}

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.1
SUBLIBRARIES = $(BUILD_ROOT_SWLIBS)/lib/libfxmisc.a \
$(BUILD_ROOT_SWLIBS)/lib/libfxpci.a \

35
glide3x/h5/glide3/src/xdraw2.inc.s
View File

@@ -23,32 +23,28 @@
/* $Header$ *
/* $Revision$ *
/* $Log$
/* Revision 1.5 2000/11/17 21:31:06 joseph
/* Restored changes that were lost when I imported new sources from 3dfx's
/* internal source repository.
/*
/* Revision 1.4 2000/11/15 23:32:54 joseph
/* Syncing up with 3dfx internal source repository. These changes contain a
/* number of bug fixes.
/*
/* Revision 1.2.2.2 2000/11/16 19:32:35 alanh
/* merge trunk into 64bit branch.
/*
/*
/* Revision 1.2.2.1 2000/11/14 14:11:19 alanh
/* merge in trunk updates, fixup pci code, and fix texus2 code pointers.
/*
/* Revision 1.3 2000/10/20 19:07:00 billwhite
/* 1.) Added changes for AMD 3DNow instructions in h5/glide3 and
/* h3/glide3.
/* 2.) Fixed a typographical error in configure.in. The default
/* texture utility library is texus2, not texus.
/*
/* Revision 1.2 2000/06/27 19:59:34 joseph
/* Previous checkin of asm files were already preprocessed.
/* Fixed build rules for 3DNow optimized assembly.
/* Revision 1.2.2.3 2000/11/16 20:01:31 alanh
/* merge trunk into 64bit branch.
/*
/* Revision 1.1 2000/06/15 00:27:43 joseph
/* Initial checkin into SourceForge.
/
/* Revision 1.1.1.1 2000/04/26 20:35:32 poppa
/* Initial Napalm Glide from Precision Insight
/* Revision 1.2.2.2 2000/11/16 19:32:35 alanh
/* merge trunk into 64bit branch.
/*
/* Revision 1.2.2.1 2000/11/14 14:11:19 alanh
/* merge in trunk updates, fixup pci code, and fix texus2 code pointers.
/*
/* Revision 1.2 2000/04/18 15:58:15 poppa
/* h5/glide3/src/glide.h: Define grSwapBuffers as grDRISwapBuffers. This
@@ -62,6 +58,13 @@
/* this file.
/* h5/minihwc/gdebug.c: Apparently fclose(NULL) fails in Linux. This
/* is the POSIX behavior as I recall.
/*
/* Revision 1.1 2000/06/15 00:27:43 joseph
/* Initial checkin into SourceForge.
/*
/* Revision 1.1.1.1 2000/04/26 20:35:32 poppa
/* Initial Napalm Glide from Precision Insight
/*
/* */
/* */
/* 2 10/30/97 6:53p Peter */
@@ -164,7 +167,7 @@
push %esi /* save caller's register variable */
push %ebx /* save caller's register variable */
mov _gc(%esp) , gc
mov _gc-4(%esp), gc
mov _vb-4(%esp) , fb /* get base address of vertex B */
push %ebp /* save frame pointer */

21
glide3x/h5/glide3/src/xdraw2.s
View File

@@ -21,19 +21,23 @@
/* $Header$ *
/* $Revision$ *
/* $Log$
/* Revision 1.4 2000/11/17 21:31:06 joseph
/* Restored changes that were lost when I imported new sources from 3dfx's
/* internal source repository.
/*
/* Revision 1.3 2000/11/15 23:32:54 joseph
/* Syncing up with 3dfx internal source repository. These changes contain a
/* number of bug fixes.
/*
/* Revision 1.2.2.2 2000/11/16 20:01:31 alanh
/* merge trunk into 64bit branch.
/*
/* Revision 1.2.2.1 2000/11/16 19:32:35 alanh
/* merge trunk into 64bit branch.
/*
/* Revision 1.1 2000/06/15 00:27:43 joseph
/* Initial checkin into SourceForge.
/*
/* Revision 1.1.1.1 2000/04/26 20:35:33 poppa
/* Initial Napalm Glide from Precision Insight
/* Revision 1.2 2000/06/27 19:59:34 joseph
/* Previous checkin of asm files were already preprocessed.
/* Fixed build rules for 3DNow optimized assembly.
/*
/* Revision 1.2 2000/04/18 15:58:15 poppa
/* h5/glide3/src/glide.h: Define grSwapBuffers as grDRISwapBuffers. This
@@ -47,6 +51,13 @@
/* this file.
/* h5/minihwc/gdebug.c: Apparently fclose(NULL) fails in Linux. This
/* is the POSIX behavior as I recall.
/*
/* Revision 1.1 2000/06/15 00:27:43 joseph
/* Initial checkin into SourceForge.
/*
/* Revision 1.1.1.1 2000/04/26 20:35:33 poppa
/* Initial Napalm Glide from Precision Insight
/*
/* */
/* */
/* 4 4/06/99 3:54p Dow */

10
glide3x/h5/glide3/src/xtexdl.s
View File

@@ -21,13 +21,21 @@
/* $Header$ *
/* $Revision$ *
/* $Log$
/* Revision 1.4 2000/11/17 21:31:06 joseph
/* Restored changes that were lost when I imported new sources from 3dfx's
/* internal source repository.
/*
/* Revision 1.3 2000/11/15 23:32:54 joseph
/* Syncing up with 3dfx internal source repository. These changes contain a
/* number of bug fixes.
/*
/* Revision 1.2.2.1 2000/11/16 19:32:35 alanh
/* Revision 1.2.2.2 2000/11/16 20:01:31 alanh
/* merge trunk into 64bit branch.
/*
/* Revision 1.2 2000/06/27 19:59:34 joseph
/* Previous checkin of asm files were already preprocessed.
/* Fixed build rules for 3DNow optimized assembly.
/*
/* Revision 1.1 2000/06/15 00:27:43 josep
/* Initial checkin into SourceForge
/