qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-05-31 01:00:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Changed #if USE_INTEL_ASM to #ifdef USE_INTEL_ASM and

Browse source 
#if !USE_INTEL_ASM to #ifndef USE_INTEL_ASM
This commit is contained in:
Marcus Sundberg 2000-05-17 20:50:22 +00:00
parent ca44147ccb
commit 22c85298f0
41 changed files with 61 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/bothdefs.h
View file

@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// defs common to client and server // defs common to client and server
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
#define UNALIGNED_OK 1 // set to 0 if unaligned accesses are not supported #define UNALIGNED_OK 1 // set to 0 if unaligned accesses are not supported
#else #else
#define UNALIGNED_OK 0 #define UNALIGNED_OK 0

2
include/d_local.h
View file

@ -87,7 +87,7 @@ surfcache_t *D_CacheSurface (msurface_t *surface, int miplevel);
extern int D_MipLevelForScale (float scale); extern int D_MipLevelForScale (float scale);
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
extern void D_PolysetAff8Start (void); extern void D_PolysetAff8Start (void);
extern void D_PolysetAff8End (void); extern void D_PolysetAff8End (void);
#endif #endif

2
include/r_local.h
View file

@ -177,7 +177,7 @@ void R_DrawSurfaceBlock16 (void);
void R_DrawSurfaceBlock8 (void); void R_DrawSurfaceBlock8 (void);
texture_t *R_TextureAnimation (texture_t *base); texture_t *R_TextureAnimation (texture_t *base);
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
void R_DrawSurfaceBlock8_mip0 (void); void R_DrawSurfaceBlock8_mip0 (void);
void R_DrawSurfaceBlock8_mip1 (void); void R_DrawSurfaceBlock8_mip1 (void);

2
source/cl_math.S
View file

@ -35,7 +35,7 @@
#include "quakeasm.h" #include "quakeasm.h"
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
.data .data

2
source/d_draw.S
View file

@ -36,7 +36,7 @@
#include "asm_draw.h" #include "asm_draw.h"
#include "d_ifacea.h" #include "d_ifacea.h"
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// 8-bpp horizontal span drawing code for polygons, with no transparency. // 8-bpp horizontal span drawing code for polygons, with no transparency.

2
source/d_draw16.S
View file

@ -37,7 +37,7 @@
#include "asm_draw.h" #include "asm_draw.h"
#include "d_ifacea.h" #include "d_ifacea.h"
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// 8-bpp horizontal span drawing code for polygons, with no transparency and // 8-bpp horizontal span drawing code for polygons, with no transparency and

2
source/d_init.c
View file

@ -173,7 +173,7 @@ void D_SetupFrame (void)
CVAR_FIXME */ CVAR_FIXME */
d_scalemip[i] = basemip[i] * d_mipscale->value; d_scalemip[i] = basemip[i] * d_mipscale->value;
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
/* if (d_subdiv16.value) /* if (d_subdiv16.value)
CVAR_FIXME */ CVAR_FIXME */
if (d_subdiv16->value) if (d_subdiv16->value)

2
source/d_modech.c
View file

@ -48,7 +48,7 @@ D_Patch
*/ */
void D_Patch (void) void D_Patch (void)
{ {
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
static qboolean protectset8 = false; static qboolean protectset8 = false;

2
source/d_part.c
View file

@ -56,7 +56,7 @@ void D_StartParticles (void)
} }
#if !USE_INTEL_ASM #ifndef USE_INTEL_ASM
/* /*
============== ==============

2
source/d_parta.S
View file

@ -36,7 +36,7 @@
#include "d_ifacea.h" #include "d_ifacea.h"
#include "asm_draw.h" #include "asm_draw.h"
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// 8-bpp particle drawing code. // 8-bpp particle drawing code.

2
source/d_polysa.S
View file

@ -36,7 +36,7 @@
#include "asm_draw.h" #include "asm_draw.h"
#include "d_ifacea.h" #include "d_ifacea.h"
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
// !!! if this is changed, it must be changed in d_polyse.c too !!! // !!! if this is changed, it must be changed in d_polyse.c too !!!
#define DPS_MAXSPANS MAXHEIGHT+1 #define DPS_MAXSPANS MAXHEIGHT+1

22
source/d_polyse.c
View file

@ -126,7 +126,7 @@ void D_PolysetSetEdgeTable (void);
void D_RasterizeAliasPolySmooth (void); void D_RasterizeAliasPolySmooth (void);
void D_PolysetScanLeftEdge (int height); void D_PolysetScanLeftEdge (int height);
#if !USE_INTEL_ASM #ifndef USE_INTEL_ASM
/* /*
================ ================
@ -422,7 +422,7 @@ void D_PolysetUpdateTables (void)
} }
#if !USE_INTEL_ASM #ifndef USE_INTEL_ASM
/* /*
=================== ===================
@ -532,7 +532,7 @@ void D_PolysetSetUpForLineScan(fixed8_t startvertu, fixed8_t startvertv,
} }
#if !USE_INTEL_ASM #ifndef USE_INTEL_ASM
/* /*
================ ================
@ -584,7 +584,7 @@ void D_PolysetCalcGradients (int skinwidth)
r_zistepy = (int)((t1 * p00_minus_p20 - t0 * p10_minus_p20) * r_zistepy = (int)((t1 * p00_minus_p20 - t0 * p10_minus_p20) *
ystepdenominv); ystepdenominv);
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
a_sstepxfrac = r_sstepx << 16; a_sstepxfrac = r_sstepx << 16;
a_tstepxfrac = r_tstepx << 16; a_tstepxfrac = r_tstepx << 16;
#else #else
@ -613,7 +613,7 @@ void InitGel (byte *palette)
} }
#if !USE_INTEL_ASM #ifndef USE_INTEL_ASM
/* /*
================ ================
@ -766,7 +766,7 @@ void D_RasterizeAliasPolySmooth (void)
d_ptex = (byte *)r_affinetridesc.pskin + (plefttop[2] >> 16) + d_ptex = (byte *)r_affinetridesc.pskin + (plefttop[2] >> 16) +
(plefttop[3] >> 16) * r_affinetridesc.skinwidth; (plefttop[3] >> 16) * r_affinetridesc.skinwidth;
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
d_sfrac = (plefttop[2] & 0xFFFF) << 16; d_sfrac = (plefttop[2] & 0xFFFF) << 16;
d_tfrac = (plefttop[3] & 0xFFFF) << 16; d_tfrac = (plefttop[3] & 0xFFFF) << 16;
d_pzbasestep = (d_zwidth + ubasestep) << 1; d_pzbasestep = (d_zwidth + ubasestep) << 1;
@ -800,7 +800,7 @@ void D_RasterizeAliasPolySmooth (void)
d_ptexbasestep = ((r_sstepy + r_sstepx * ubasestep) >> 16) + d_ptexbasestep = ((r_sstepy + r_sstepx * ubasestep) >> 16) +
((r_tstepy + r_tstepx * ubasestep) >> 16) * ((r_tstepy + r_tstepx * ubasestep) >> 16) *
r_affinetridesc.skinwidth; r_affinetridesc.skinwidth;
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
d_sfracbasestep = (r_sstepy + r_sstepx * ubasestep) << 16; d_sfracbasestep = (r_sstepy + r_sstepx * ubasestep) << 16;
d_tfracbasestep = (r_tstepy + r_tstepx * ubasestep) << 16; d_tfracbasestep = (r_tstepy + r_tstepx * ubasestep) << 16;
#else #else
@ -813,7 +813,7 @@ void D_RasterizeAliasPolySmooth (void)
d_ptexextrastep = ((r_sstepy + r_sstepx * d_countextrastep) >> 16) + d_ptexextrastep = ((r_sstepy + r_sstepx * d_countextrastep) >> 16) +
((r_tstepy + r_tstepx * d_countextrastep) >> 16) * ((r_tstepy + r_tstepx * d_countextrastep) >> 16) *
r_affinetridesc.skinwidth; r_affinetridesc.skinwidth;
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
d_sfracextrastep = (r_sstepy + r_sstepx*d_countextrastep) << 16; d_sfracextrastep = (r_sstepy + r_sstepx*d_countextrastep) << 16;
d_tfracextrastep = (r_tstepy + r_tstepx*d_countextrastep) << 16; d_tfracextrastep = (r_tstepy + r_tstepx*d_countextrastep) << 16;
#else #else
@ -854,7 +854,7 @@ void D_RasterizeAliasPolySmooth (void)
d_pdestbasestep = screenwidth + ubasestep; d_pdestbasestep = screenwidth + ubasestep;
d_pdestextrastep = d_pdestbasestep + 1; d_pdestextrastep = d_pdestbasestep + 1;
d_pdest = (byte *)d_viewbuffer + ystart * screenwidth + plefttop[0]; d_pdest = (byte *)d_viewbuffer + ystart * screenwidth + plefttop[0];
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
d_pzbasestep = (d_zwidth + ubasestep) << 1; d_pzbasestep = (d_zwidth + ubasestep) << 1;
d_pzextrastep = d_pzbasestep + 2; d_pzextrastep = d_pzbasestep + 2;
#else #else
@ -872,7 +872,7 @@ void D_RasterizeAliasPolySmooth (void)
d_ptexbasestep = ((r_sstepy + r_sstepx * ubasestep) >> 16) + d_ptexbasestep = ((r_sstepy + r_sstepx * ubasestep) >> 16) +
((r_tstepy + r_tstepx * ubasestep) >> 16) * ((r_tstepy + r_tstepx * ubasestep) >> 16) *
r_affinetridesc.skinwidth; r_affinetridesc.skinwidth;
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
d_sfracbasestep = (r_sstepy + r_sstepx * ubasestep) << 16; d_sfracbasestep = (r_sstepy + r_sstepx * ubasestep) << 16;
d_tfracbasestep = (r_tstepy + r_tstepx * ubasestep) << 16; d_tfracbasestep = (r_tstepy + r_tstepx * ubasestep) << 16;
#else #else
@ -885,7 +885,7 @@ void D_RasterizeAliasPolySmooth (void)
d_ptexextrastep = ((r_sstepy + r_sstepx * d_countextrastep) >> 16) + d_ptexextrastep = ((r_sstepy + r_sstepx * d_countextrastep) >> 16) +
((r_tstepy + r_tstepx * d_countextrastep) >> 16) * ((r_tstepy + r_tstepx * d_countextrastep) >> 16) *
r_affinetridesc.skinwidth; r_affinetridesc.skinwidth;
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
d_sfracextrastep = ((r_sstepy+r_sstepx*d_countextrastep) & 0xFFFF)<<16; d_sfracextrastep = ((r_sstepy+r_sstepx*d_countextrastep) & 0xFFFF)<<16;
d_tfracextrastep = ((r_tstepy+r_tstepx*d_countextrastep) & 0xFFFF)<<16; d_tfracextrastep = ((r_tstepy+r_tstepx*d_countextrastep) & 0xFFFF)<<16;
#else #else

6
source/d_scan.c
View file

@ -98,7 +98,7 @@ void D_WarpScreen (void)
} }
#if !USE_INTEL_ASM #ifndef USE_INTEL_ASM
/* /*
============= =============
@ -254,7 +254,7 @@ void Turbulent8 (espan_t *pspan)
} }
#if !USE_INTEL_ASM #ifndef USE_INTEL_ASM
/* /*
============= =============
@ -392,7 +392,7 @@ void D_DrawSpans8 (espan_t *pspan)
#endif #endif
#if !USE_INTEL_ASM #ifndef USE_INTEL_ASM
/* /*
============= =============

2
source/d_scana.S
View file

@ -36,7 +36,7 @@
#include "asm_draw.h" #include "asm_draw.h"
#include "d_ifacea.h" #include "d_ifacea.h"
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
.data .data

2
source/d_spr8.S
View file

@ -35,7 +35,7 @@
#include "quakeasm.h" #include "quakeasm.h"
#include "asm_draw.h" #include "asm_draw.h"
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// 8-bpp horizontal span drawing code for polygons, with transparency. // 8-bpp horizontal span drawing code for polygons, with transparency.

2
source/d_sprite.c
View file

@ -38,7 +38,7 @@ static int sprite_height;
static int minindex, maxindex; static int minindex, maxindex;
static sspan_t *sprite_spans; static sspan_t *sprite_spans;
#if !USE_INTEL_ASM #ifndef USE_INTEL_ASM
/* /*
===================== =====================

2
source/d_vars.c
View file

@ -27,7 +27,7 @@
*/ */
// r_vars.c: global refresh variables // r_vars.c: global refresh variables
#if !USE_INTEL_ASM #ifndef USE_INTEL_ASM
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>

2
source/d_varsa.S
View file

@ -34,7 +34,7 @@
#include "asm_draw.h" #include "asm_draw.h"
#include "d_ifacea.h" #include "d_ifacea.h"
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
.data .data

2
source/math.S
View file

@ -35,7 +35,7 @@
// #include "quakeasm.h" // #include "quakeasm.h"
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
.data .data

4
source/mathlib.c
View file

@ -186,7 +186,7 @@ void BOPS_Error (void)
Sys_Error ("BoxOnPlaneSide: Bad signbits"); Sys_Error ("BoxOnPlaneSide: Bad signbits");
} }
#if !USE_INTEL_ASM #ifndef USE_INTEL_ASM
/* /*
================== ==================
@ -570,7 +570,7 @@ int GreatestCommonDivisor (int i1, int i2)
} }
#if !USE_INTEL_ASM #ifndef USE_INTEL_ASM
// TODO: move to nonintel.c // TODO: move to nonintel.c

2
source/nonintel.c
View file

@ -32,7 +32,7 @@
#endif #endif
#include "quakedef.h" #include "quakedef.h"
#if !USE_INTEL_ASM #ifndef USE_INTEL_ASM
/* /*
================ ================

2
source/r_aclip.c
View file

@ -103,7 +103,7 @@ void R_Alias_clip_z (finalvert_t *pfv0, finalvert_t *pfv1, finalvert_t *out)
} }
#if !USE_INTEL_ASM #ifndef USE_INTEL_ASM
void R_Alias_clip_left (finalvert_t *pfv0, finalvert_t *pfv1, finalvert_t *out) void R_Alias_clip_left (finalvert_t *pfv0, finalvert_t *pfv1, finalvert_t *out)
{ {

2
source/r_aclipa.S
View file

@ -36,7 +36,7 @@
#include "asm_draw.h" #include "asm_draw.h"
#include "d_ifacea.h" #include "d_ifacea.h"
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
.data .data
Ltemp0: .long 0 Ltemp0: .long 0

4
source/r_alias.c
View file

@ -461,7 +461,7 @@ void R_AliasTransformFinalVert (finalvert_t *fv, auxvert_t *av,
} }
#if !USE_INTEL_ASM #ifndef USE_INTEL_ASM
/* /*
================ ================
@ -760,7 +760,7 @@ void R_AliasDrawModel (alight_t *plighting)
} }
else else
{ {
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
D_Aff8Patch (currententity->colormap); D_Aff8Patch (currententity->colormap);
#endif #endif
} }

2
source/r_aliasa.S
View file

@ -36,7 +36,7 @@
#include "asm_draw.h" #include "asm_draw.h"
#include "d_ifacea.h" #include "d_ifacea.h"
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
.data .data

2
source/r_draw.c
View file

@ -79,7 +79,7 @@ int r_ceilv1;
qboolean r_lastvertvalid; qboolean r_lastvertvalid;
#if !USE_INTEL_ASM #ifndef USE_INTEL_ASM
/* /*
================ ================

2
source/r_drawa.S
View file

@ -36,7 +36,7 @@
#include "asm_draw.h" #include "asm_draw.h"
#include "d_ifacea.h" #include "d_ifacea.h"
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
// !!! if these are changed, they must be changed in r_draw.c too !!! // !!! if these are changed, they must be changed in r_draw.c too !!!
#define FULLY_CLIPPED_CACHED 0x80000000 #define FULLY_CLIPPED_CACHED 0x80000000

8
source/r_edge.c
View file

@ -170,7 +170,7 @@ void R_BeginEdgeFrame (void)
} }
#if !USE_INTEL_ASM #ifndef USE_INTEL_ASM
/* /*
============== ==============
@ -216,7 +216,7 @@ addedge:
#endif // !USE_INTEL_ASM #endif // !USE_INTEL_ASM
#if !USE_INTEL_ASM #ifndef USE_INTEL_ASM
/* /*
============== ==============
@ -236,7 +236,7 @@ void R_RemoveEdges (edge_t *pedge)
#endif // !USE_INTEL_ASM #endif // !USE_INTEL_ASM
#if !USE_INTEL_ASM #ifndef USE_INTEL_ASM
/* /*
============== ==============
@ -462,7 +462,7 @@ void R_TrailingEdge (surf_t *surf, edge_t *edge)
} }
#if !USE_INTEL_ASM #ifndef USE_INTEL_ASM
/* /*
============== ==============

2
source/r_edgea.S
View file

@ -35,7 +35,7 @@
#include "quakeasm.h" #include "quakeasm.h"
#include "asm_draw.h" #include "asm_draw.h"
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
.data .data
Ltemp: .long 0 Ltemp: .long 0

4
source/r_main.c
View file

@ -345,7 +345,7 @@ void R_Init (void)
R_InitParticles (); R_InitParticles ();
// TODO: collect 386-specific code in one place // TODO: collect 386-specific code in one place
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
Sys_MakeCodeWriteable ((long)R_EdgeCodeStart, Sys_MakeCodeWriteable ((long)R_EdgeCodeStart,
(long)R_EdgeCodeEnd - (long)R_EdgeCodeStart); (long)R_EdgeCodeEnd - (long)R_EdgeCodeStart);
#endif // USE_INTEL_ASM #endif // USE_INTEL_ASM
@ -612,7 +612,7 @@ void R_ViewChanged (vrect_t *pvrect, int lineadj, float aspect)
r_fov_greater_than_90 = true; r_fov_greater_than_90 = true;
// TODO: collect 386-specific code in one place // TODO: collect 386-specific code in one place
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
if (r_pixbytes == 1) if (r_pixbytes == 1)
{ {
Sys_MakeCodeWriteable ((long)R_Surf8Start, Sys_MakeCodeWriteable ((long)R_Surf8Start,

2
source/r_misc.c
View file

@ -390,7 +390,7 @@ void R_TransformFrustum (void)
} }
#if !USE_INTEL_ASM #ifndef USE_INTEL_ASM
/* /*
================ ================

2
source/r_surf.c
View file

@ -330,7 +330,7 @@ void R_DrawSurface (void)
//============================================================================= //=============================================================================
#if !USE_INTEL_ASM #ifndef USE_INTEL_ASM
/* /*
================ ================

2
source/r_vars.c
View file

@ -32,7 +32,7 @@
#endif #endif
#include "quakedef.h" #include "quakedef.h"
#if !USE_INTEL_ASM #ifndef USE_INTEL_ASM
// all global and static refresh variables are collected in a contiguous block // all global and static refresh variables are collected in a contiguous block
// to avoid cache conflicts. // to avoid cache conflicts.

2
source/r_varsa.S
View file

@ -34,7 +34,7 @@
#include "asm_draw.h" #include "asm_draw.h"
#include "d_ifacea.h" #include "d_ifacea.h"
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
.data .data

4
source/snd_mix.c
View file

@ -46,7 +46,7 @@ short *snd_out;
void Snd_WriteLinearBlastStereo16 (void); void Snd_WriteLinearBlastStereo16 (void);
#if !USE_INTEL_ASM #ifndef USE_INTEL_ASM
void Snd_WriteLinearBlastStereo16 (void) void Snd_WriteLinearBlastStereo16 (void)
{ {
int i; int i;
@ -356,7 +356,7 @@ void SND_InitScaletable (void)
} }
#if !USE_INTEL_ASM #ifndef USE_INTEL_ASM
void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int count) void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int count)
{ {

2
source/snd_mixa.S
View file

@ -34,7 +34,7 @@
#include "asm_i386.h" #include "asm_i386.h"
// #include "quakeasm.h" // #include "quakeasm.h"
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
.text .text

2
source/surf16.S
View file

@ -35,7 +35,7 @@
#include "quakeasm.h" #include "quakeasm.h"
#include "asm_draw.h" #include "asm_draw.h"
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// Surface block drawer // Surface block drawer

2
source/surf8.S
View file

@ -35,7 +35,7 @@
#include "quakeasm.h" #include "quakeasm.h"
#include "asm_draw.h" #include "asm_draw.h"
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
.data .data

4
source/sys_linux.c
View file

@ -183,7 +183,7 @@ void Sys_Quit (void)
void Sys_Init(void) void Sys_Init(void)
{ {
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
Sys_SetFPCW(); Sys_SetFPCW();
#endif #endif
} }
@ -386,7 +386,7 @@ char *Sys_ConsoleInput(void)
return NULL; return NULL;
} }
#if !USE_INTEL_ASM #ifndef USE_INTEL_ASM
void Sys_HighFPPrecision (void) void Sys_HighFPPrecision (void)
{ {
} }

2
source/world.c
View file

@ -453,7 +453,7 @@ POINT TESTING IN HULLS
=============================================================================== ===============================================================================
*/ */
#if !USE_INTEL_ASM #ifndef USE_INTEL_ASM
/* /*
================== ==================

2
source/worlda.S
View file

@ -35,7 +35,7 @@
//#include "quakeasm.h" //#include "quakeasm.h"
//include "d_ifacea.h" //include "d_ifacea.h"
#if USE_INTEL_ASM #ifdef USE_INTEL_ASM
.data .data