diff --git a/glide3x/h3/glide3/src/cpudtect.S b/glide3x/h3/glide3/src/cpudtect.S index 4f051e7..5cbc934 100644 --- a/glide3x/h3/glide3/src/cpudtect.S +++ b/glide3x/h3/glide3/src/cpudtect.S @@ -2,51 +2,57 @@ ** 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 +** 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. -** +** 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. -** +** THE UNITED STATES. +** ** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED ** */ -/* $Header$ */ -/* $Log$ -/* Revision 1.1.1.1 1999/11/24 21:44:53 joseph -/* Initial checkin for SourceForge -/* */ -/* */ -/* 4 4/06/99 3:54p Dow */ -/* Alt tab again. */ -/* */ -/* 9 3/10/99 10:40a Peter */ -/* detect katmai-ness */ -/* */ -/* 8 1/20/99 5:50p Peter */ -/* norbert's code for k6 and k7 (?) wc */ -/* */ -/* 7 12/09/98 1:11p Peter */ -/* cpu detection from Norbert for teh rest of the 3DNow!(tm) partners */ -/* */ -/* 6 10/03/98 3:35p Peter */ -/* First pass at dynamic detection of 3DNow!(tm) */ -/* */ -/* 5 7/24/98 1:40p Hohn */ -/* */ -/* 4 5/28/97 8:23a Peter */ -/* Merge w/ original glide source */ -/* */ -/* 2 3/04/97 9:10p Dow */ -/* Neutered mutiplatform multiheaded monster. */ +/* + * $Header$ + * $Log$ + * Revision 1.1.1.1.6.1 2003/05/05 07:12:46 dborca + * no message + * + * Revision 1.1.1.1 1999/11/24 21:44:53 joseph + * Initial checkin for SourceForge + * + * + * 4 4/06/99 3:54p Dow + * Alt tab again. + * + * 9 3/10/99 10:40a Peter + * detect katmai-ness + * + * 8 1/20/99 5:50p Peter + * norbert's code for k6 and k7 (?) wc + * + * 7 12/09/98 1:11p Peter + * cpu detection from Norbert for teh rest of the 3DNow!(tm) partners + * + * 6 10/03/98 3:35p Peter + * First pass at dynamic detection of 3DNow!(tm) + * + * 5 7/24/98 1:40p Hohn + * + * 4 5/28/97 8:23a Peter + * Merge w/ original glide source + * + * 2 3/04/97 9:10p Dow + * Neutered mutiplatform multiheaded monster. + * + */ diff --git a/glide3x/h3/glide3/src/xdraw2.S b/glide3x/h3/glide3/src/xdraw2.S index 6ebda62..5d35930 100644 --- a/glide3x/h3/glide3/src/xdraw2.S +++ b/glide3x/h3/glide3/src/xdraw2.S @@ -2,100 +2,106 @@ ** 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 +** 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. -** +** 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. -** +** THE UNITED STATES. +** ** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED */ -/* $Header$ */ -/* $Revision$ */ -/* $Log$ -/* Revision 1.2.8.2 2003/06/19 08:38:16 dborca -/* fixes: DOS gamma, modetabl.h timings (avoid shimmering), -/* Napalm memory probing, more DJGPP MMX specializations, -/* new 32bit texture files, Linux build valid again, etc. /* -/* Revision 1.2.8.1 2003/05/05 07:12:47 dborca -/* no message -/* -/* Revision 1.2 2000/02/15 22:35:59 joseph -/* Changes to support FreeBSD (patch submitted by Doug Rabson) -/* -/* Revision 1.1.1.1 1999/11/24 21:44:58 joseph -/* Initial checkin for SourceForge -/* */ -/* */ -/* 4 4/06/99 3:54p Dow */ -/* Alt tab again. */ -/* */ -/* 12 4/05/99 11:34a Atai */ -/* added GLIDE_ALT_TAB for xdraw2.inc to query context in the retail build */ -/* */ -/* 11 3/19/99 11:26a Peter */ -/* expose direct fifo for gl */ -/* */ -/* 10 10/14/98 12:05p Peter */ -/* fixed my f*cked up assumption about non-volatile regs */ -/* */ -/* 9 10/12/98 9:51a Peter */ -/* dynamic 3DNow!(tm) */ -/* */ -/* 8 9/24/98 11:17a Dow */ -/* AMD 3DNow! (tm) mods */ -/* */ -/* 7 8/30/98 1:34p Dow */ -/* State & other optimizations */ -/* */ -/* 6 8/29/98 8:12p Dow */ -/* Clip optimization */ -/* */ -/* 5 7/01/98 8:41a Jdt */ -/* removed gc arg from trisetup funcs */ -/* */ -/* 4 8/03/98 6:36a Jdt */ -/* Add GC to trisetup arglist */ -/* */ -/* 3 6/09/98 11:59a Atai */ -/* 1. update glide header */ -/* 2. fix cull mode */ -/* 3. fix tri stats */ -/* */ -/* 8 5/18/98 3:21p Peter */ -/* dynamic culling changes */ -/* */ -/* 6 1/15/98 1:12p Peter */ -/* dispatch w/o packing */ -/* */ -/* 5 11/06/97 3:47p Peter */ -/* */ -/* 4 11/04/97 5:04p Peter */ -/* cataclysm part deux */ -/* */ -/* 3 11/01/97 10:01a Peter */ -/* tri dispatch stuff */ -/* */ -/* 2 10/30/97 6:53p Peter */ -/* first real cut at tri asm */ -/* */ -/* 1 10/30/97 4:29p Peter */ -/* asm tri code */ -/* */ -/* 2 7/07/97 2:14p Jdt */ -/* assembly now on par with C code. */ -/* */ -/* 1 7/07/97 8:37a Jdt */ -/* B4 Chip field fix. */ + * $Header$ + * $Revision$ + * $Log$ + * Revision 1.2.8.3 2003/06/29 18:43:27 guillemj + * Fix compilation warnings. + * + * Revision 1.2.8.2 2003/06/19 08:38:16 dborca + * fixes: DOS gamma, modetabl.h timings (avoid shimmering), + * Napalm memory probing, more DJGPP MMX specializations, + * new 32bit texture files, Linux build valid again, etc. + * + * Revision 1.2.8.1 2003/05/05 07:12:47 dborca + * no message + * + * Revision 1.2 2000/02/15 22:35:59 joseph + * Changes to support FreeBSD (patch submitted by Doug Rabson) + * + * Revision 1.1.1.1 1999/11/24 21:44:58 joseph + * Initial checkin for SourceForge + * + **************** + * 4 4/06/99 3:54p Dow + * Alt tab again. + * + * 12 4/05/99 11:34a Atai + * added GLIDE_ALT_TAB for xdraw2.inc to query context in the retail build + * + * 11 3/19/99 11:26a Peter + * expose direct fifo for gl + * + * 10 10/14/98 12:05p Peter + * fixed my f*cked up assumption about non-volatile regs + * + * 9 10/12/98 9:51a Peter + * dynamic 3DNow!(tm) + * + * 8 9/24/98 11:17a Dow + * AMD 3DNow! (tm) mods + * + * 7 8/30/98 1:34p Dow + * State & other optimizations + * + * 6 8/29/98 8:12p Dow + * Clip optimization + * + * 5 7/01/98 8:41a Jdt + * removed gc arg from trisetup funcs + * + * 4 8/03/98 6:36a Jdt + * Add GC to trisetup arglist + * + * 3 6/09/98 11:59a Atai + * 1. update glide header + * 2. fix cull mode + * 3. fix tri stats + * + * 8 5/18/98 3:21p Peter + * dynamic culling changes + * + * 6 1/15/98 1:12p Peter + * dispatch w/o packing + * + * 5 11/06/97 3:47p Peter + * + * 4 11/04/97 5:04p Peter + * cataclysm part deux + * + * 3 11/01/97 10:01a Peter + * tri dispatch stuff + * + * 2 10/30/97 6:53p Peter + * first real cut at tri asm + * + * 1 10/30/97 4:29p Peter + * asm tri code + * + * 2 7/07/97 2:14p Jdt + * assembly now on par with C code. + * + * 1 7/07/97 8:37a Jdt + * B4 Chip field fix. + * + */ .file "xdraw2.asm" diff --git a/glide3x/h3/glide3/src/xdraw2.inc.S b/glide3x/h3/glide3/src/xdraw2.inc.S index a816e59..c391883 100644 --- a/glide3x/h3/glide3/src/xdraw2.inc.S +++ b/glide3x/h3/glide3/src/xdraw2.inc.S @@ -3,52 +3,59 @@ ** 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 +** 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. -** +** 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. -** +** THE UNITED STATES. +** ** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED */ -/* $Header$ */ -/* $Revision$ */ -/* $Log$ -/* Revision 1.4 2002/04/09 22:21:43 alanh -/* AMD 3DNow fixes /* -/* 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. + * $Header$ + * $Revision$ + * $Log$ + * Revision 1.4.2.1 2003/05/05 07:12:47 dborca + * no message + * + * Revision 1.4 2002/04/09 22:21:43 alanh + * AMD 3DNow fixes + * + * 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/02/15 22:35:59 joseph + * Changes to support FreeBSD (patch submitted by Doug Rabson) + * + * Revision 1.1.1.1 1999/11/24 21:44:58 joseph + * Initial checkin for SourceForge + * + */ /* -/* Revision 1.2 2000/02/15 22:35:59 joseph -/* Changes to support FreeBSD (patch submitted by Doug Rabson) -/* -/* Revision 1.1.1.1 1999/11/24 21:44:58 joseph -/* Initial checkin for SourceForge -/* */ -/* */ -/* 2 10/30/97 6:53p Peter */ -/* first real cut at tri asm */ -/* */ -/* 1 10/30/97 4:29p Peter */ -/* asm tri code */ -/* */ -/* 2 7/07/97 2:14p Jdt */ -/* assembly now on par with C code. */ -/* */ -/* 1 7/07/97 8:37a Jdt */ -/* B4 Chip field fix. */ + * 2 10/30/97 6:53p Peter + * first real cut at tri asm + * + * 1 10/30/97 4:29p Peter + * asm tri code + * + * 2 7/07/97 2:14p Jdt + * assembly now on par with C code. + * + * 1 7/07/97 8:37a Jdt + * B4 Chip field fix. + * + */ #ifdef GL_AMD3D diff --git a/glide3x/h3/glide3/src/xdraw3.S b/glide3x/h3/glide3/src/xdraw3.S index 64d75ec..7f678ab 100644 --- a/glide3x/h3/glide3/src/xdraw3.S +++ b/glide3x/h3/glide3/src/xdraw3.S @@ -611,9 +611,9 @@ ALIGN(32) /* 989 : } */ /* 990 : else { */ -/* 991 : /* */ +/* 991 : * */ /* 992 : * first cut of clip space coordinate code, no optimization. */ -/* 993 : /* */ +/* 993 : * */ /* 994 : float oow */ /* 995 : */ /* 996 : while (count > 0) { */ @@ -628,7 +628,7 @@ ALIGN(32) /* 1005 : vPtr = *(float **)pointers */ /* 1006 : oow = 1.0f / FARRAY(vPtr, gc->state.vData.wInfo.offset) */ /* 1007 : */ -/* 1008 : /* x, y /* */ +/* 1008 : * x, y * */ /* 1009 : TRI_SETF(FARRAY(vPtr, 0) */ /* 1010 : *oow*gc->state.Viewport.hwidth + gc->state.Viewport.ox) */ /* 1011 : TRI_SETF(FARRAY(vPtr, 4) */ @@ -1850,7 +1850,7 @@ ALIGN(32) pfrcpit2 %mm1 , %mm0 /* oow = 1.0f / FARRAY(vPtr, gc->state.vData.wInfo.offset */ mov paramIndex(%gc) , %esi /* gc->state.paramIndex */ -/* /* x, y /* */ +/* * x, y * */ /* TRI_SETF(FARRAY(vPtr, 0) */ /* *oow*gc->state.Viewport.hwidth + gc->state.Viewport.ox) */ /* TRI_SETF(FARRAY(vPtr, 4) */ @@ -2158,7 +2158,7 @@ ALIGN(32) .L_grDrawVertexList_3DNow_Clip_strip_done: /* } */ /* #undef FN_NAME */ -/* } /* _grDrawVertexList /* */ +/* } * _grDrawVertexList * */ pop %ebx /* restore caller's register variable */ pop %ebp /* restore frame pointer */