From 583de68697dcc94ba6346c4b68e47b4d7ba4c5bc Mon Sep 17 00:00:00 2001 From: chacha Date: Wed, 25 Mar 2026 00:29:34 +0100 Subject: [PATCH] cleanning --- .gitignore | 6 +- glide2x/cvg/cmd/pass/makefile.linux | 3 + glide2x/cvg/glide/src/fxgasm.c | 4 -- glide2x/cvg/glide/src/fxinline.h | 10 ---- glide2x/cvg/glide/src/gdraw.c | 48 +++++++++++++--- glide2x/cvg/glide/src/makefile.linux | 11 +--- glide2x/cvg/glide/src/xdrawtri.asm | 46 --------------- glide2x/cvg/init/sli.c | 4 +- glide2x/h3/glide/src/cpudtect.asm | 1 + glide2x/h3/glide/src/glimport.asm | 7 +++ glide2x/h3/glide/src/makefile.linux | 17 +++--- glide2x/h3/glide/src/xdraw2.asm | 4 ++ glide2x/h3/glide/src/xdraw2.inc | 4 ++ glide2x/h3/glide/src/xdrawtri.S | 38 ------------- glide2x/h3/glide/src/xdrawtri.asm | 46 --------------- glide2x/h3/glide/src/xtexdl.asm | 4 ++ glide2x/makefile.linux | 6 +- glide2x/sst1/glide/src/fxinline.h | 7 --- glide3x/cvg/glide3/src/fxgasm.h | 82 --------------------------- glide3x/cvg/glide3/src/fxinline.h | 10 ---- glide3x/cvg/glide3/tests/test00.exe | Bin 26980 -> 0 bytes glide3x/h3/glide3/src/cpudtect.asm | 1 + swlibs/include/make/3dfx.mak | 4 +- swlibs/texus2/makefile.unix | 3 + 24 files changed, 87 insertions(+), 279 deletions(-) delete mode 100644 glide2x/cvg/glide/src/fxinline.h delete mode 100644 glide2x/cvg/glide/src/xdrawtri.asm delete mode 100644 glide2x/h3/glide/src/xdrawtri.S delete mode 100644 glide2x/h3/glide/src/xdrawtri.asm delete mode 100644 glide2x/sst1/glide/src/fxinline.h delete mode 100644 glide3x/cvg/glide3/src/fxgasm.h delete mode 100644 glide3x/cvg/glide3/src/fxinline.h delete mode 100644 glide3x/cvg/glide3/tests/test00.exe diff --git a/.gitignore b/.gitignore index 68f5336..e0851aa 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ *.a *.lo *.so +*.exe fxgasm.h -fxgasm.exe -fxgasm \ No newline at end of file +*.exe +fxgasm +fxinline.h \ No newline at end of file diff --git a/glide2x/cvg/cmd/pass/makefile.linux b/glide2x/cvg/cmd/pass/makefile.linux index fcc1244..9d984bb 100644 --- a/glide2x/cvg/cmd/pass/makefile.linux +++ b/glide2x/cvg/cmd/pass/makefile.linux @@ -17,6 +17,9 @@ # # COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED # +# $Revision$ +# $Date$ +# # local defines, options, includes LCDEFS = diff --git a/glide2x/cvg/glide/src/fxgasm.c b/glide2x/cvg/glide/src/fxgasm.c index b91810d..456b69a 100644 --- a/glide2x/cvg/glide/src/fxgasm.c +++ b/glide2x/cvg/glide/src/fxgasm.c @@ -129,10 +129,6 @@ main (int argc, char **argv) OFFSET (gc, cmdTransportInfo.fifoLfbP, "fifoLfbP"); OFFSET (gc, cmdTransportInfo.lfbLockCount, "lfbLockCount"); -#if GLIDE_DISPATCH_SETUP - OFFSET (gc,curArchProcs.triSetupProc,"kTriProcOffset\t\t"); -#endif - SIZEOF (gr.GCs[0].state,"GrState\t"); SIZEOF (gr.hwConfig,"GrHwConfiguration"); SIZEOF (gr.GCs[0],"GC\t"); diff --git a/glide2x/cvg/glide/src/fxinline.h b/glide2x/cvg/glide/src/fxinline.h deleted file mode 100644 index f89c261..0000000 --- a/glide2x/cvg/glide/src/fxinline.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef __FX_INLINE_H__ -#define __FX_INLINE_H__ - -#define kCurGCOffset 0x2CUL -#define kTriProcOffset 0x350UL -#define kTriProcOffsetClean 848 -/* The # of 2-byte entries in the hw fog table */ -#define kInternalFogTableEntryCount 0x40UL - -#endif /* __FX_INLINE_H__ */ diff --git a/glide2x/cvg/glide/src/gdraw.c b/glide2x/cvg/glide/src/gdraw.c index 6621ad0..8d130d4 100644 --- a/glide2x/cvg/glide/src/gdraw.c +++ b/glide2x/cvg/glide/src/gdraw.c @@ -95,6 +95,7 @@ * 77 11/15/97 7:43p Peter * more comdex silliness * + ** */ #include @@ -649,8 +650,7 @@ all_done: /* come here on degenerate lines */ /*--------------------------------------------------------------------------- ** grDrawTriangle */ -#ifndef HAVE_XDRAWTRI_ASM /* grDrawTriangle() not in asm */ -#if defined(_MSC_VER) && !GLIDE_USE_C_TRISETUP && !defined(GLIDE_DEBUG) +#if (GLIDE_PLATFORM & GLIDE_OS_WIN32) && !GLIDE_USE_C_TRISETUP && !defined(GLIDE_DEBUG) __declspec(naked) #endif GR_ENTRY(grDrawTriangle, void, (const GrVertex *a, const GrVertex *b, const GrVertex *c)) @@ -694,8 +694,8 @@ GR_ENTRY(grDrawTriangle, void, (const GrVertex *a, const GrVertex *b, const GrVe all_done: GR_END(); - -#elif defined(_MSC_VER) +#else +#if defined(__MSC__) { __asm { mov edx, [_GlideRoot + kCurGCOffset]; @@ -703,13 +703,47 @@ all_done: jmp eax; } } +#endif +#if defined( __linux__ ) -#else -#error "Write triangle proc dispatch for this compiler" + /* Here's the basic strategy for this dispatch code: + * We jump to _GlideRoot.curGC->archDispatchProcs.triSetupProc + * which contains code that looks like a function, we leave the + * paramters passed to grDrawTriangle on the stack and the dispatched + * function picks them up. However we have to compensate for + * the compiler pushing anything on the stack. The following describes + * why and when we have to pop. + * + * BIG_OPT: gcc pushes a frame pointer to maintain things, BIG_OPT + * turns on -fomit-frame-pointer so we don't have to pop it. + * + * PIC: When using position independant code gcc stores eip in ebx + * so it saves ebx from the previous call automatically. + * Therefore, once we have the jump address we have to pop ebx + * to restore the stack. + * + * The syntax is further complicated by the fact that gcc can (and will) + * emit code between the asm statements, so they all need to be in a single + * asm statement, wrapped with #ifdef's. This means we have fun with + * deciding if we need to list trashed registers and when we need commas + * between them. + */ + +asm ( +#if defined(PIC) + "popl %%ebx\n\t" +#endif + "jmp *%0" + : + : "m" (_GlideRoot.curGC->curArchProcs.triSetupProc) +#if defined(PIC) + : "ebx" +#endif +); +#endif #endif #undef FN_NAME } /* grDrawTriangle */ -#endif /* HAVE_XDRAWTRI_ASM */ /*--------------------------------------------------------------------------- ** grDrawPlanarPolygon diff --git a/glide2x/cvg/glide/src/makefile.linux b/glide2x/cvg/glide/src/makefile.linux index 94d5232..c91d6d0 100644 --- a/glide2x/cvg/glide/src/makefile.linux +++ b/glide2x/cvg/glide/src/makefile.linux @@ -43,6 +43,8 @@ # realclean: remove all generated files # + + .PHONY: all glide2x clean realclean .INTERMEDIATE: fxgasm .SUFFIXES: .lo @@ -108,8 +110,6 @@ override USE_FIFO = 1 ifeq ($(USE_X86),1) CDEFS += -DGLIDE_DISPATCH_SETUP=1 -DGLIDE_DISPATCH_DOWNLOAD=1 override USE_FIFO = 1 -CDEFS += -DHAVE_XDRAWTRI_ASM=1 -override USE_DRAWTRI_ASM = 1 else CDEFS += -DGLIDE_USE_C_TRISETUP=1 endif @@ -194,9 +194,6 @@ GLIDE_OBJECTS = \ fpu.o \ xtexdl_def.o -ifeq ($(USE_DRAWTRI_ASM),1) -GLIDE_OBJECTS += xdrawtri.o -endif ifeq ($(USE_X86),1) GLIDE_OBJECTS += \ xdraw2_def.o @@ -287,8 +284,6 @@ xdraw2_3dnow.o: xdraw2.asm $(AS) -o $@ $(ASFLAGS) -DGL_AMD3D=1 $< xtexdl_3dnow.o: xtexdl.asm $(AS) -o $@ $(ASFLAGS) -DGL_AMD3D=1 $< -xdrawtri.o: xdrawtri.asm - $(AS) -o $@ $(ASFLAGS) $< #cpuid.lo: cpuid.o # $(CP) $< $@ @@ -302,8 +297,6 @@ xdraw2_3dnow.lo: xdraw2_3dnow.o $(CP) $< $@ xtexdl_3dnow.lo: xtexdl_3dnow.o $(CP) $< $@ -xdrawtri.lo: xdrawtri.o - $(CP) $< $@ $(GLIDE_OBJECTS): fxinline.h fxgasm.h diff --git a/glide2x/cvg/glide/src/xdrawtri.asm b/glide2x/cvg/glide/src/xdrawtri.asm deleted file mode 100644 index 767f417..0000000 --- a/glide2x/cvg/glide/src/xdrawtri.asm +++ /dev/null @@ -1,46 +0,0 @@ -;; THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -;; PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -;; TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -;; INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -;; DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -;; THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -;; EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -;; FULL TEXT OF THE NON-WARRANTY PROVISIONS. -;; -;; USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -;; RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -;; TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -;; AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -;; SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -;; THE UNITED STATES. -;; -;; COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED - -;; Adapted from gdraw.c:grDrawTriangle() for nasm - -%include "xos.inc" - -%include "fxgasm.h" - -extrn _GlideRoot - -segment SEG_TEXT - -align 16 -proc grDrawTriangle, 12 - -;;mov edx, dword [_GlideRoot+curGC] -;;mov eax, dword [edx+kTriProcOffset] - mov eax, dword [_GlideRoot+curGC] - jmp [eax + kTriProcOffset] -endp - align 16 - -%if XOS == XOS_WIN32 -%ifdef __MINGW32__ -; GNU LD fails with '_' prefix -export grDrawTriangle@12 -%else -export _grDrawTriangle@12 -%endif -%endif ; _WIN32 diff --git a/glide2x/cvg/init/sli.c b/glide2x/cvg/init/sli.c index c042b6c..3397672 100644 --- a/glide2x/cvg/init/sli.c +++ b/glide2x/cvg/init/sli.c @@ -185,7 +185,7 @@ FX_EXPORT FxBool FX_CSTYLE sst1InitSli(FxU32 *sstbase0, FxU32 *sstbase1) return(FXFALSE); PCICFG_RD(SST1_PCI_INIT_ENABLE, j); PCICFG_WR(SST1_PCI_INIT_ENABLE, - ((j & ~SST_SCANLINE_SLV_OWNPCI) | SST_SCANLINE_SLI_SLV)); + ((j & ~SST_SCANLINE_SLV_OWNPCI) | SST_SCANLINE_SLI_SLV)); ISET(sstSlave->fbiInit1, IGET(sstSlave->fbiInit1) | (SST_VIDEO_RESET | SST_EN_SCANLINE_INTERLEAVE)); sst1InitIdleFBINoNOP(sstbase1); @@ -229,7 +229,7 @@ FX_EXPORT FxBool FX_CSTYLE sst1InitSli(FxU32 *sstbase0, FxU32 *sstbase1) ~(SST_VIDEO_CLK_SLAVE_OE_EN | SST_VID_CLK_2X_OUT_OE_EN)) | SST_VID_CLK_DAC_DATA16_SEL); ISET(sstSlave->fbiInit1, IGET(sstSlave->fbiInit1) & - ~SST_VIDEO_VID_CLK_SLAVE); + ~SST_VIDEO_VID_CLK_SLAVE); sst1CurrentBoard->fbiInit6 &= ~SST_SLI_SYNC_MASTER; sst1CurrentBoard->fbiInit6 = ((sst1CurrentBoard->fbiInit6 & ~(SST_SLI_SWAP_VACTIVE | SST_SLI_SWAP_VACTIVE_DRAG)) | diff --git a/glide2x/h3/glide/src/cpudtect.asm b/glide2x/h3/glide/src/cpudtect.asm index 450a371..cfb067c 100644 --- a/glide2x/h3/glide/src/cpudtect.asm +++ b/glide2x/h3/glide/src/cpudtect.asm @@ -279,6 +279,7 @@ UnknownVendor: mov eax, 0ffffffffh jmp DoneCpu + endp diff --git a/glide2x/h3/glide/src/glimport.asm b/glide2x/h3/glide/src/glimport.asm index 2cf5d1e..1574e63 100644 --- a/glide2x/h3/glide/src/glimport.asm +++ b/glide2x/h3/glide/src/glimport.asm @@ -16,6 +16,9 @@ ;; THE UNITED STATES. ;; ;; COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED +;; +;; $Revision$ +;; $Log$ ;; ;; 3 3/17/99 6:16p Dow ;; Phantom Menace and other fixes. @@ -25,6 +28,10 @@ ;** ;** IMPLIB.ASM: This is a template for an import library. ;** +;; $Header$ + +;** +;** .386p .MODEL FLAT diff --git a/glide2x/h3/glide/src/makefile.linux b/glide2x/h3/glide/src/makefile.linux index 09434a3..b951e7c 100644 --- a/glide2x/h3/glide/src/makefile.linux +++ b/glide2x/h3/glide/src/makefile.linux @@ -112,8 +112,6 @@ override USE_FIFO = 1 ifeq ($(USE_X86),1) CDEFS += -DGLIDE_DISPATCH_SETUP=1 -DGLIDE_DISPATCH_DOWNLOAD=1 override USE_FIFO = 1 -CDEFS += -DHAVE_XDRAWTRI_ASM=1 -override USE_DRAWTRI_ASM = 1 else CDEFS += -DGLIDE_USE_C_TRISETUP=1 endif @@ -194,15 +192,14 @@ GLIDE_OBJECTS = \ cpuid.o \ xtexdl_def.o -ifeq ($(USE_DRAWTRI_ASM),1) -GLIDE_OBJECTS += xdrawtri.o -endif ifeq ($(USE_X86),1) GLIDE_OBJECTS += \ - xdraw2_def.o + xdraw2_def.o \ + xdraw3_def.o ifeq ($(USE_3DNOW),1) GLIDE_OBJECTS += \ xdraw2_3dnow.o \ + xdraw3_3dnow.o \ xtexdl_3dnow.o endif else @@ -270,12 +267,14 @@ cpuid.o: cpudtect.asm $(AS) -o $@ $(ASFLAGS) $< xdraw2_def.o: xdraw2.asm $(AS) -o $@ $(ASFLAGS) $< +xdraw3_def.o: xdraw3.asm + $(AS) -o $@ $(ASFLAGS) $< xdraw2_3dnow.o: xdraw2.asm $(AS) -o $@ $(ASFLAGS) -DGL_AMD3D=1 $< +xdraw3_3dnow.o: xdraw3.asm + $(AS) -o $@ $(ASFLAGS) -DGL_AMD3D=1 $< xtexdl_3dnow.o: xtexdl.asm $(AS) -o $@ $(ASFLAGS) -DGL_AMD3D=1 $< -xdrawtri.o: xdrawtri.asm - $(AS) -o $@ $(ASFLAGS) $< cpuid.lo: cpuid.o $(CP) $< $@ @@ -289,8 +288,6 @@ xdraw3_3dnow.lo: xdraw3_3dnow.o $(CP) $< $@ xtexdl_3dnow.lo: xtexdl_3dnow.o $(CP) $< $@ -xdrawtri.lo: xdrawtri.o - $(CP) $< $@ $(GLIDE_OBJECTS): fxinline.h fxgasm.h diff --git a/glide2x/h3/glide/src/xdraw2.asm b/glide2x/h3/glide/src/xdraw2.asm index 7ee620a..a539a5f 100644 --- a/glide2x/h3/glide/src/xdraw2.asm +++ b/glide2x/h3/glide/src/xdraw2.asm @@ -16,6 +16,10 @@ ;; ;; COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED ;; +;; $Header$ +;; $Revision$ +;; $Log$ +;; ;; 3 3/17/99 6:17p Dow ;; Phantom Menace and other fixes. ;; diff --git a/glide2x/h3/glide/src/xdraw2.inc b/glide2x/h3/glide/src/xdraw2.inc index 7abec64..9e3fd62 100644 --- a/glide2x/h3/glide/src/xdraw2.inc +++ b/glide2x/h3/glide/src/xdraw2.inc @@ -16,6 +16,10 @@ ;; THE UNITED STATES. ;; ;; COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED +;; +;; $Header$ +;; $Revision$ +;; $Log$ ; ; 2 10/30/97 6:53p Peter ; first real cut at tri asm diff --git a/glide2x/h3/glide/src/xdrawtri.S b/glide2x/h3/glide/src/xdrawtri.S deleted file mode 100644 index ffc4a7a..0000000 --- a/glide2x/h3/glide/src/xdrawtri.S +++ /dev/null @@ -1,38 +0,0 @@ -/* - * THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY - * PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT - * TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX - * INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE - * DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). - * THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER - * EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A - * FULL TEXT OF THE NON-WARRANTY PROVISIONS. - * - * USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO - * RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN - * TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, - * AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR - * SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF - * THE UNITED STATES. - * - * COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED - */ - -/* Adapted from gdraw.c:grDrawTriangle() for gas */ - -#include "fxgasm.h" - -.extern _GlideRoot - -.text - -.p2align 4,,15 -.globl grDrawTriangle -.type grDrawTriangle,@function -grDrawTriangle: -/*movl (_GlideRoot+curGC),%edx - movl kTriProcOffset(%edx),%eax*/ - movl (_GlideRoot + curGC),%eax - jmp *kTriProcOffset(%eax) - -.p2align 4,,15 diff --git a/glide2x/h3/glide/src/xdrawtri.asm b/glide2x/h3/glide/src/xdrawtri.asm deleted file mode 100644 index 767f417..0000000 --- a/glide2x/h3/glide/src/xdrawtri.asm +++ /dev/null @@ -1,46 +0,0 @@ -;; THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -;; PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -;; TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -;; INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -;; DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -;; THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -;; EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -;; FULL TEXT OF THE NON-WARRANTY PROVISIONS. -;; -;; USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -;; RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -;; TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -;; AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -;; SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -;; THE UNITED STATES. -;; -;; COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED - -;; Adapted from gdraw.c:grDrawTriangle() for nasm - -%include "xos.inc" - -%include "fxgasm.h" - -extrn _GlideRoot - -segment SEG_TEXT - -align 16 -proc grDrawTriangle, 12 - -;;mov edx, dword [_GlideRoot+curGC] -;;mov eax, dword [edx+kTriProcOffset] - mov eax, dword [_GlideRoot+curGC] - jmp [eax + kTriProcOffset] -endp - align 16 - -%if XOS == XOS_WIN32 -%ifdef __MINGW32__ -; GNU LD fails with '_' prefix -export grDrawTriangle@12 -%else -export _grDrawTriangle@12 -%endif -%endif ; _WIN32 diff --git a/glide2x/h3/glide/src/xtexdl.asm b/glide2x/h3/glide/src/xtexdl.asm index 68cb8d3..9dd45f2 100644 --- a/glide2x/h3/glide/src/xtexdl.asm +++ b/glide2x/h3/glide/src/xtexdl.asm @@ -15,6 +15,10 @@ ;; THE UNITED STATES. ;; ;; COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED +;; +;; $Header$ +;; $Revision$ +;; $Log$ ;; ;; 3 3/17/99 6:17p Dow ;; Phantom Menace and other fixes. diff --git a/glide2x/makefile.linux b/glide2x/makefile.linux index 9f35e22..1dbb346 100644 --- a/glide2x/makefile.linux +++ b/glide2x/makefile.linux @@ -19,9 +19,9 @@ # DRI=1 Build DRI version. # target = h3 # default = no -# XPATH specify X11 path; needed by SST96 and H3. -# default = /usr/X11R6 -# X11LIBS X libraries path; default = $(XPATH)/lib +# XPATH specify X libraries path; needed by DRI. +# target = h3 +# default = /usr/X11R6/lib # H4=1 High speed Avenger/Napalm. # target = h3 # default = no diff --git a/glide2x/sst1/glide/src/fxinline.h b/glide2x/sst1/glide/src/fxinline.h deleted file mode 100644 index 04d625d..0000000 --- a/glide2x/sst1/glide/src/fxinline.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __FX_INLINE_H__ -#define __FX_INLINE_H__ - -/* The # of 2-byte entries in the hw fog table */ -#define kInternalFogTableEntryCount 0x40UL - -#endif /* __FX_INLINE_H__ */ diff --git a/glide3x/cvg/glide3/src/fxgasm.h b/glide3x/cvg/glide3/src/fxgasm.h deleted file mode 100644 index 250a3f3..0000000 --- a/glide3x/cvg/glide3/src/fxgasm.h +++ /dev/null @@ -1,82 +0,0 @@ - -;---------------------------------------------------------------------- -; Assembler offsets for SSTREGS struct -;---------------------------------------------------------------------- - - - -;---------------------------------------------------------------------- -; Assembler offsets for GC struct -;---------------------------------------------------------------------- - -base_ptr equ 00000000h -reg_ptr equ 00000004h -lfb_ptr equ 0000000ch -tex_ptr equ 00000008h -cull_mode equ 000000d0h -tsuDataList equ 00000014h -triPacketHdr equ 00000358h -cullStripHdr equ 0000035ch -paramMask equ 00000360h -triSetupProc equ 00000344h -drawTrianglesProc equ 00000348h -drawVertexList equ 0000034ch -fifoStart equ 00000364h -fifoEnd equ 00000368h -fifoOffset equ 0000036ch -fifoSize equ 00000370h -fifoJmpHdr equ 00000374h -fifoPtr equ 00000378h -fifoRead equ 0000037ch -fifoRoom equ 00000380h -roomToReadPtr equ 00000384h -roomToEnd equ 00000388h -fifoLfbP equ 0000038ch -lfbLockCount equ 00000390h -vertexSize equ 00000278h -vertexStride equ 00000274h -invalid equ 00000280h -CoordinateSpace equ 0000033ch -paramIndex equ 000000d4h -vp_hwidth equ 00000208h -vp_hheight equ 0000020ch -vp_hdepth equ 00000210h -vp_ox equ 000001fch -vp_oy equ 00000200h -vp_oz equ 00000204h -colorType equ 0000027ch -wInfo_offset equ 00000228h -qInfo_mode equ 0000025ch -qInfo_offset equ 00000260h -q0Info_offset equ 00000268h -q1Info_offset equ 00000270h -q0Info_mode equ 00000264h -q1Info_mode equ 0000026ch -tmu0_s_scale equ 00000144h -tmu0_t_scale equ 00000148h -tmu1_s_scale equ 00000184h -tmu1_t_scale equ 00000188h -SIZEOF_GrState equ 00000274h -SIZEOF_GC equ 00000438h - - -;---------------------------------------------------------------------- -; Assembler offsets for GlideRoot struct -;---------------------------------------------------------------------- - -p6Fencer equ 00000000h -current_sst equ 00000004h -curGC equ 00000008h -curTriSize equ 00000014h -stats_linesDrawn equ 00000074h -stats_otherTrisDrawn equ 00000080h -trisProcessed equ 00000078h -trisDrawn equ 0000007ch -pool_f0 equ 00000020h -pool_fHalf equ 00000024h -pool_f1 equ 00000028h -pool_f255 equ 0000002ch -pool_fTemp1 equ 00000030h -pool_fTemp2 equ 00000034h -SIZEOF_GlideRoot equ 00001248h - diff --git a/glide3x/cvg/glide3/src/fxinline.h b/glide3x/cvg/glide3/src/fxinline.h deleted file mode 100644 index 834c0da..0000000 --- a/glide3x/cvg/glide3/src/fxinline.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef __FX_INLINE_H__ -#define __FX_INLINE_H__ - -#define kCurGCOffset 0x8UL -#define kTriProcOffset 0x344UL -#define kGCStateInvalid 0x280UL -/* The # of 2-byte entries in the hw fog table */ -#define kInternalFogTableEntryCount 0x40 - -#endif /* __FX_INLINE_H__ */ diff --git a/glide3x/cvg/glide3/tests/test00.exe b/glide3x/cvg/glide3/tests/test00.exe deleted file mode 100644 index bc38ea10d2efce1f40ea37706dcea908f95090c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26980 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 diff --git a/glide3x/h3/glide3/src/cpudtect.asm b/glide3x/h3/glide3/src/cpudtect.asm index ce802cb..ded42ad 100644 --- a/glide3x/h3/glide3/src/cpudtect.asm +++ b/glide3x/h3/glide3/src/cpudtect.asm @@ -274,6 +274,7 @@ UnknownVendor: mov eax, 0ffffffffh jmp DoneCpu + endp diff --git a/swlibs/include/make/3dfx.mak b/swlibs/include/make/3dfx.mak index 0b33d71..9f0b32b 100644 --- a/swlibs/include/make/3dfx.mak +++ b/swlibs/include/make/3dfx.mak @@ -75,7 +75,6 @@ endif # FX_COMPILER must be set to either MICROSOFT or WATCOM # DEBUG must be set to enable debugging flags for cc and link # - ifeq ($(CC),) CC = gcc endif @@ -180,6 +179,7 @@ LDLIBS = $(LLDLIBS) $(GLDLIBS) #-------------------------------------------------------------------------- # configure OS commands # + ifeq "$(OS)" "sunos" AR = /usr/5bin/ar crsl ECHO = /usr/5bin/echo @@ -371,8 +371,6 @@ $(THISDIR)rmtargets: .SUFFIXES: .cod .i .bat .sh .c.cod: - echo "TADAA!!!" - echo "$OS" $(CC) $(CFLAGS) $(ASM_LIST_FLAGS) $*.c .c.i: diff --git a/swlibs/texus2/makefile.unix b/swlibs/texus2/makefile.unix index 8671c07..6e43b9a 100644 --- a/swlibs/texus2/makefile.unix +++ b/swlibs/texus2/makefile.unix @@ -14,6 +14,9 @@ # successor clauses in the FAR, DOD or NASA FAR Supplement. Unpublished - # rights reserved under the Copyright Laws of the United States. # +# $Revision$ +# $Date$ +# THISDIR = texus2