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-16 20:03:20 +00:00
parent 985b19361e
commit 7816b80116
10 changed files with 83 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
glide3x/h5/glide3/src/cpudtect.lst
View File

@@ -27,6 +27,9 @@ cpudtect.asm Page 1 - 1
;; 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:33 alanh
;; merge trunk into 64bit branch.
;;
;; Revision 1.1 2000/06/15 00:27:42 joseph
;; Initial checkin into SourceForge.
;;

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

@@ -24,6 +24,9 @@
/* 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:33 alanh
/* merge trunk into 64bit branch.
/*
/* Revision 1.2.2.1 2000/08/30 08:37:51 alanh
/* Voodoo5 changes for 64bit architectures
/*

31
glide3x/h5/glide3/src/fifo.c
View File

@@ -1,18 +1,21 @@
/*
** Copyright (c) 1995, 3Dfx Interactive, Inc
** All Rights Reserved
*
** This is UNPUBLISHED PROPRIETARY SOURCE CODE of 3Dfx Interactive, Inc.
** the contents of this file may not be disclosed to third parties, copied o
** duplicated in any form, in whole or in part, without the prior writte
** permission of 3Dfx Interactive, Inc
*
** RESTRICTED RIGHTS LEGEND
** Use, duplication or disclosure by the Government is subject to restriction
** as set forth in subdivision (c)(1)(ii) of the Rights in Technical Dat
** and Computer Software clause at DFARS 252.227-7013, and/or in similar o
** successor clauses in the FAR, DOD or NASA FAR Supplement. Unpublished
** rights reserved under the Copyright Laws of the United States
** 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
*
** $Header$
** $Log:

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

@@ -227,8 +227,8 @@ OTHER_CFILES = fxgasm.c fxbldno.c fxinline.h
# targets
LDIRT = fxgasm.o fxgasm fxgasm.h fxinline.h fxbldno.o fxbldno fxbldno.h
LIBRARIES = libglide3.a
SHARED_LIBRARY = libglide3.so.3.10
LIBRARIES = libglide3x.a
SHARED_LIBRARY = libglide3.so.3.1
SUBLIBRARIES = $(BUILD_ROOT_SWLIBS)/lib/libfxmisc.a \
$(BUILD_ROOT_SWLIBS)/lib/libfxpci.a \
$(BUILD_ROOT)/$(FX_GLIDE_HW)/lib/libminihwc.a

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

@@ -27,6 +27,10 @@
/* 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.
/*

27
glide3x/h5/glide3/src/xdraw2.lst
View File

@@ -27,6 +27,9 @@ xdraw2.asm Page 1 - 1
;; 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
;; merge trunk into 64bit branch.
;;
;; Revision 1.1 2000/06/15 00:27:43 joseph
;; Initial checkin into SourceForge.
;;
@@ -292,6 +295,9 @@ xdraw2.asm Page 1 - 1
C ;; Syncing up with 3dfx internal source repository. These changes contain a
C ;; number of bug fixes.
C ;;
C ;; Revision 1.2.2.1 2000/11/16 19:32:35 alanh
C ;; merge trunk into 64bit branch.
C ;;
C ;; Revision 1.1 2000/06/15 00:27:43 joseph
C ;; Initial checkin into SourceForge.
C ;;
@@ -1277,6 +1283,9 @@ xdraw2.asm Page 1 - 1
C ;; Syncing up with 3dfx internal source repository. These changes contain a
C ;; number of bug fixes.
C ;;
C ;; Revision 1.2.2.1 2000/11/16 19:32:35 alanh
C ;; merge trunk into 64bit branch.
C ;;
C ;; Revision 1.1 2000/06/15 00:27:43 joseph
C ;; Initial checkin into SourceForge.
C ;;
@@ -2262,6 +2271,9 @@ xdraw2.asm Page 1 - 1
C ;; Syncing up with 3dfx internal source repository. These changes contain a
C ;; number of bug fixes.
C ;;
C ;; Revision 1.2.2.1 2000/11/16 19:32:35 alanh
C ;; merge trunk into 64bit branch.
C ;;
C ;; Revision 1.1 2000/06/15 00:27:43 joseph
C ;; Initial checkin into SourceForge.
C ;;
@@ -3247,6 +3259,9 @@ xdraw2.asm Page 1 - 1
C ;; Syncing up with 3dfx internal source repository. These changes contain a
C ;; number of bug fixes.
C ;;
C ;; Revision 1.2.2.1 2000/11/16 19:32:35 alanh
C ;; merge trunk into 64bit branch.
C ;;
C ;; Revision 1.1 2000/06/15 00:27:43 joseph
C ;; Initial checkin into SourceForge.
C ;;
@@ -4232,6 +4247,9 @@ xdraw2.asm Page 1 - 1
C ;; Syncing up with 3dfx internal source repository. These changes contain a
C ;; number of bug fixes.
C ;;
C ;; Revision 1.2.2.1 2000/11/16 19:32:35 alanh
C ;; merge trunk into 64bit branch.
C ;;
C ;; Revision 1.1 2000/06/15 00:27:43 joseph
C ;; Initial checkin into SourceForge.
C ;;
@@ -5286,6 +5304,9 @@ ENDM ; GR_FIFO_WRITE
C ;; Syncing up with 3dfx internal source repository. These changes contain a
C ;; number of bug fixes.
C ;;
C ;; Revision 1.2.2.1 2000/11/16 19:32:35 alanh
C ;; merge trunk into 64bit branch.
C ;;
C ;; Revision 1.1 2000/06/15 00:27:43 joseph
C ;; Initial checkin into SourceForge.
C ;;
@@ -6339,6 +6360,9 @@ ENDM ; GR_FIFO_WRITE
C ;; Syncing up with 3dfx internal source repository. These changes contain a
C ;; number of bug fixes.
C ;;
C ;; Revision 1.2.2.1 2000/11/16 19:32:35 alanh
C ;; merge trunk into 64bit branch.
C ;;
C ;; Revision 1.1 2000/06/15 00:27:43 joseph
C ;; Initial checkin into SourceForge.
C ;;
@@ -7392,6 +7416,9 @@ ENDM ; GR_FIFO_WRITE
C ;; Syncing up with 3dfx internal source repository. These changes contain a
C ;; number of bug fixes.
C ;;
C ;; Revision 1.2.2.1 2000/11/16 19:32:35 alanh
C ;; merge trunk into 64bit branch.
C ;;
C ;; Revision 1.1 2000/06/15 00:27:43 joseph
C ;; Initial checkin into SourceForge.
C ;;

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

@@ -21,10 +21,14 @@
/* $Header$ *
/* $Revision$ *
/* $Log$
/*
/* 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
/* merge trunk into 64bit branch.
/*
/* Revision 1.1 2000/06/15 00:27:43 joseph
/* Initial checkin into SourceForge.
/*

3
glide3x/h5/glide3/src/xtexdl.lst
View File

@@ -27,6 +27,9 @@ xtexdl.asm Page 1 - 1
;; 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
;; merge trunk into 64bit branch.
;;
;; Revision 1.1 2000/06/15 00:27:43 joseph
;; Initial checkin into SourceForge.
;;

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

@@ -25,6 +25,9 @@
/* 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
/* merge trunk into 64bit branch.
/*
/* Revision 1.1 2000/06/15 00:27:43 josep
/* Initial checkin into SourceForge
/

31
glide3x/h5/minihwc/minihwc.c
View File

@@ -1,18 +1,21 @@
/*
** Copyright (c) 1996, 3Dfx Interactive, Inc.
** All Rights Reserved.
**
** This is UNPUBLISHED PROPRIETARY SOURCE CODE of 3Dfx Interactive, Inc.;
** the contents of this file may not be disclosed to third parties, copied or
** duplicated in any form, in whole or in part, without the prior written
** permission of 3Dfx Interactive, Inc.
**
** RESTRICTED RIGHTS LEGEND:
** 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.
** 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
**
** $Header$
** $Log: