Run the vacuum cleaner over sw32's global variables.

This seems to be everything that can be made static.
This commit is contained in:
Bill Currie 2012-02-21 14:10:20 +09:00
parent db4a463727
commit f7007825e4
17 changed files with 110 additions and 127 deletions

View File

@ -244,8 +244,8 @@ void R_GenTile (msurface_t *psurf, void *pdest);
extern float d_zitable[65536];
extern float skyspeed;
extern float skytime;
extern float r_skyspeed;
extern float r_skytime;
extern int c_surf;
extern vrect_t scr_vrect;

View File

@ -211,7 +211,6 @@ typedef struct btofpoly_s {
#define MAX_BTOFPOLYS 5000 // FIXME: tune this
extern int numbtofpolys;
extern btofpoly_t *pbtofpolys;
void R_InitTurb (void);
void R_ZDrawSubmodelPolys (model_t *clmodel);
@ -221,7 +220,6 @@ void R_ZDrawSubmodelPolys (model_t *clmodel);
#define ALIAS_Z_CLIP_PLANE 5
extern int numverts;
extern int a_skinwidth;
extern int numtriangles;
extern float leftclip, topclip, rightclip, bottomclip;
extern int r_acliptype;
@ -272,8 +270,6 @@ extern int r_maxvalidedgeoffset;
void R_AliasClipTriangle (mtriangle_t *ptri);
extern float r_time1;
extern float dp_time1, dp_time2, db_time1, db_time2, rw_time1, rw_time2;
extern float se_time1, se_time2, de_time1, de_time2, dv_time1, dv_time2;
extern int r_frustum_indexes[4*6];
extern int r_maxsurfsseen, r_maxedgesseen;
extern qboolean r_dowarpold, r_viewchanged;
@ -294,7 +290,6 @@ void R_TimeGraph (void);
void R_ZGraph (void);
void R_PrintAliasStats (void);
void R_PrintTimes (void);
void R_PrintDSpeeds (void);
void R_AnimateLight (void);
int R_LightPoint (const vec3_t p);
void R_SetupFrame (void);
@ -333,23 +328,6 @@ void R_InitVars (void);
void R_LoadSky_f (void);
void R_DrawSurfaceBlock_mip0 (void);
void R_DrawSurfaceBlock_mip1 (void);
void R_DrawSurfaceBlock_mip2 (void);
void R_DrawSurfaceBlock_mip3 (void);
void R_DrawSurfaceBlock8_mip0 (void);
void R_DrawSurfaceBlock8_mip1 (void);
void R_DrawSurfaceBlock8_mip2 (void);
void R_DrawSurfaceBlock8_mip3 (void);
void R_DrawSurfaceBlock16_mip0 (void);
void R_DrawSurfaceBlock16_mip1 (void);
void R_DrawSurfaceBlock16_mip2 (void);
void R_DrawSurfaceBlock16_mip3 (void);
void R_DrawSurfaceBlock32_mip0 (void);
void R_DrawSurfaceBlock32_mip1 (void);
void R_DrawSurfaceBlock32_mip2 (void);
void R_DrawSurfaceBlock32_mip3 (void);
extern byte crosshair_data[];
#define CROSSHAIR_WIDTH 8
#define CROSSHAIR_HEIGHT 8

View File

@ -60,7 +60,7 @@ D_Sky_uv_To_st (int u, int v, fixed16_t *s, fixed16_t *t)
end[2] *= 3;
VectorNormalize (end);
temp = skytime * skyspeed; // TODO: add D_SetupFrame & set this there
temp = r_skytime * r_skyspeed; // TODO: add D_SetupFrame & set this there
*s = (int) ((temp + 6 * (SKYSIZE / 2 - 1) * end[0]) * 0x10000);
*t = (int) ((temp + 6 * (SKYSIZE / 2 - 1) * end[1]) * 0x10000);
}

View File

@ -54,6 +54,9 @@ static mvertex_t *pbverts;
static bedge_t *pbedges;
static int numbverts, numbedges;
int numbtofpolys;
static btofpoly_t *pbtofpolys;
static mvertex_t *pfrontenter, *pfrontexit;
static qboolean makeclippededge;

View File

@ -75,9 +75,6 @@ int r_outofedges;
qboolean r_dowarp, r_dowarpold, r_viewchanged;
int numbtofpolys;
btofpoly_t *pbtofpolys;
int c_surf;
int r_maxsurfsseen, r_maxedgesseen;
static int r_cnumsurfs;
@ -113,8 +110,8 @@ int r_frustum_indexes[4 * 6];
float r_aliastransition, r_resfudge;
float dp_time1, dp_time2, db_time1, db_time2, rw_time1, rw_time2;
float se_time1, se_time2, de_time1, de_time2, dv_time1, dv_time2;
static float dp_time1, dp_time2, db_time1, db_time2, rw_time1, rw_time2;
static float se_time1, se_time2, de_time1, de_time2, dv_time1, dv_time2;
void
R_Init (void)
@ -631,6 +628,28 @@ R_DrawBEntitiesOnList (void)
insubmodel = false;
}
static void
R_PrintDSpeeds (void)
{
float ms, dp_time, r_time2, rw_time, db_time, se_time, de_time,
dv_time;
r_time2 = Sys_DoubleTime ();
dp_time = (dp_time2 - dp_time1) * 1000;
rw_time = (rw_time2 - rw_time1) * 1000;
db_time = (db_time2 - db_time1) * 1000;
se_time = (se_time2 - se_time1) * 1000;
de_time = (de_time2 - de_time1) * 1000;
dv_time = (dv_time2 - dv_time1) * 1000;
ms = (r_time2 - r_time1) * 1000;
Sys_Printf ("%3i %4.1fp %3iw %4.1fb %3is %4.1fe %4.1fv\n",
(int) ms, dp_time, (int) rw_time, db_time, (int) se_time,
de_time, dv_time);
}
static void
R_EdgeDrawing (void)
{

View File

@ -112,28 +112,6 @@ R_PrintTimes (void)
c_surf = 0;
}
void
R_PrintDSpeeds (void)
{
float ms, dp_time, r_time2, rw_time, db_time, se_time, de_time,
dv_time;
r_time2 = Sys_DoubleTime ();
dp_time = (dp_time2 - dp_time1) * 1000;
rw_time = (rw_time2 - rw_time1) * 1000;
db_time = (db_time2 - db_time1) * 1000;
se_time = (se_time2 - se_time1) * 1000;
de_time = (de_time2 - de_time1) * 1000;
dv_time = (dv_time2 - dv_time1) * 1000;
ms = (r_time2 - r_time1) * 1000;
Sys_Printf ("%3i %4.1fp %3iw %4.1fb %3is %4.1fe %4.1fv\n",
(int) ms, dp_time, (int) rw_time, db_time, (int) se_time,
de_time, dv_time);
}
void
R_PrintAliasStats (void)
{

View File

@ -38,10 +38,9 @@ static __attribute__ ((used)) const char rcsid[] =
static int iskyspeed = 8;
static int iskyspeed2 = 2;
float skyspeed;
static float skyspeed2;
float r_skyspeed;
float skytime;
float r_skytime;
byte *r_skysource;
@ -101,8 +100,8 @@ R_MakeSky (void)
unsigned int *pnewsky;
static int xlast = -1, ylast = -1;
xshift = skytime * skyspeed;
yshift = skytime * skyspeed;
xshift = r_skytime * r_skyspeed;
yshift = r_skytime * r_skyspeed;
if ((xshift == xlast) && (yshift == ylast))
return;
@ -154,8 +153,8 @@ R_GenSkyTile (void *pdest)
unsigned int *pnewsky;
unsigned int *pd;
xshift = skytime * skyspeed;
yshift = skytime * skyspeed;
xshift = r_skytime * r_skyspeed;
yshift = r_skytime * r_skyspeed;
pnewsky = (unsigned int *) &newsky[0];
pd = (unsigned int *) pdest;
@ -199,15 +198,14 @@ R_SetSkyFrame (void)
int g, s1, s2;
float temp;
skyspeed = iskyspeed;
skyspeed2 = iskyspeed2;
r_skyspeed = iskyspeed;
g = GreatestCommonDivisor (iskyspeed, iskyspeed2);
s1 = iskyspeed / g;
s2 = iskyspeed2 / g;
temp = SKYSIZE * s1 * s2;
skytime = vr_data.realtime - ((int) (vr_data.realtime / temp) * temp);
r_skytime = vr_data.realtime - ((int) (vr_data.realtime / temp) * temp);
r_skymade = 0;
}

View File

@ -57,6 +57,11 @@ int r_numvblocks;
static unsigned char *r_source;
unsigned char *r_sourcemax;
void R_DrawSurfaceBlock_mip0 (void);
void R_DrawSurfaceBlock_mip1 (void);
void R_DrawSurfaceBlock_mip2 (void);
void R_DrawSurfaceBlock_mip3 (void);
static void (*surfmiptable[4]) (void) = {
R_DrawSurfaceBlock_mip0, R_DrawSurfaceBlock_mip1,
R_DrawSurfaceBlock_mip2, R_DrawSurfaceBlock_mip3};

View File

@ -43,7 +43,7 @@ static int miplevel;
float scale_for_mip;
vec3_t transformed_modelorg;
static vec3_t transformed_modelorg;
void

View File

@ -61,7 +61,7 @@ D_Sky_uv_To_st (int u, int v, fixed16_t *s, fixed16_t *t)
end[2] *= 3;
VectorNormalize (end);
temp = skytime * skyspeed; // TODO: add D_SetupFrame & set this there
temp = r_skytime * r_skyspeed; // TODO: add D_SetupFrame & set this there
*s = (int) ((temp + 6 * (SKYSIZE / 2 - 1) * end[0]) * 0x10000);
*t = (int) ((temp + 6 * (SKYSIZE / 2 - 1) * end[1]) * 0x10000);
}

View File

@ -67,7 +67,7 @@ static vec3_t alias_forward, alias_right, alias_up;
static maliasskindesc_t *pskindesc;
int r_amodels_drawn;
int a_skinwidth;
static int a_skinwidth;
static int r_anumverts;
static float aliastransform[3][4];

View File

@ -54,6 +54,9 @@ static mvertex_t *pbverts;
static bedge_t *pbedges;
static int numbverts, numbedges;
int numbtofpolys;
static btofpoly_t *pbtofpolys;
static mvertex_t *pfrontenter, *pfrontexit;
static qboolean makeclippededge;

View File

@ -42,7 +42,7 @@ static __attribute__ ((used)) const char rcsid[] =
#define FULLY_CLIPPED_CACHED 0x80000000
#define FRAMECOUNT_MASK 0x7FFFFFFF
unsigned int cacheoffset;
static unsigned int cacheoffset;
int c_faceclip; // number of faces clipped

View File

@ -55,7 +55,6 @@ static __attribute__ ((used)) const char rcsid[] =
//define PASSAGES
void *colormap;
static vec3_t viewlightvec;
static alight_t r_viewlighting = { 128, 192, viewlightvec };
int r_numallocatededges;
@ -69,9 +68,6 @@ int r_outofedges;
qboolean r_dowarp, r_dowarpold, r_viewchanged;
int numbtofpolys;
btofpoly_t *pbtofpolys;
int c_surf;
int r_maxsurfsseen, r_maxedgesseen;
static int r_cnumsurfs;
@ -107,8 +103,8 @@ int r_frustum_indexes[4 * 6];
float r_aliastransition, r_resfudge;
float dp_time1, dp_time2, db_time1, db_time2, rw_time1, rw_time2;
float se_time1, se_time2, de_time1, de_time2, dv_time1, dv_time2;
static float dp_time1, dp_time2, db_time1, db_time2, rw_time1, rw_time2;
static float se_time1, se_time2, de_time1, de_time2, dv_time1, dv_time2;
void
R_Textures_Init (void)
@ -212,7 +208,6 @@ R_NewMap (model_t *worldmodel, struct model_s **models, int num_models)
// surface 0 doesn't really exist; it's just a dummy because index 0
// is used to indicate no edge attached to surface
surfaces--;
R_SurfacePatch ();
} else {
r_surfsonstack = true;
}
@ -635,6 +630,28 @@ R_DrawBEntitiesOnList (void)
insubmodel = false;
}
static void
R_PrintDSpeeds (void)
{
float ms, dp_time, r_time2, rw_time, db_time, se_time, de_time,
dv_time;
r_time2 = Sys_DoubleTime ();
dp_time = (dp_time2 - dp_time1) * 1000;
rw_time = (rw_time2 - rw_time1) * 1000;
db_time = (db_time2 - db_time1) * 1000;
se_time = (se_time2 - se_time1) * 1000;
de_time = (de_time2 - de_time1) * 1000;
dv_time = (dv_time2 - dv_time1) * 1000;
ms = (r_time2 - r_time1) * 1000;
Sys_Printf ("%3i %4.1fp %3iw %4.1fb %3is %4.1fe %4.1fv\n",
(int) ms, dp_time, (int) rw_time, db_time, (int) se_time,
de_time, dv_time);
}
static void
R_EdgeDrawing (void)
{
@ -657,7 +674,6 @@ R_EdgeDrawing (void)
// surface 0 doesn't really exist; it's just a dummy because index 0
// is used to indicate no edge attached to surface
surfaces--;
R_SurfacePatch ();
}
R_BeginEdgeFrame ();

View File

@ -112,28 +112,6 @@ R_PrintTimes (void)
c_surf = 0;
}
void
R_PrintDSpeeds (void)
{
float ms, dp_time, r_time2, rw_time, db_time, se_time, de_time,
dv_time;
r_time2 = Sys_DoubleTime ();
dp_time = (dp_time2 - dp_time1) * 1000;
rw_time = (rw_time2 - rw_time1) * 1000;
db_time = (db_time2 - db_time1) * 1000;
se_time = (se_time2 - se_time1) * 1000;
de_time = (de_time2 - de_time1) * 1000;
dv_time = (dv_time2 - dv_time1) * 1000;
ms = (r_time2 - r_time1) * 1000;
Sys_Printf ("%3i %4.1fp %3iw %4.1fb %3is %4.1fe %4.1fv\n",
(int) ms, dp_time, (int) rw_time, db_time, (int) se_time,
de_time, dv_time);
}
void
R_PrintAliasStats (void)
{

View File

@ -47,10 +47,9 @@ static __attribute__ ((used)) const char rcsid[] =
static int iskyspeed = 8;
static int iskyspeed2 = 2;
float skyspeed;
static float skyspeed2;
float r_skyspeed;
float skytime;
float r_skytime;
byte *r_skysource;
@ -118,8 +117,8 @@ R_MakeSky (void)
byte *base1, *base2;
static int xlast = -1, ylast = -1;
xshift2 = skytime * skyspeed * 2.0f;
yshift2 = skytime * skyspeed * 2.0f;
xshift2 = r_skytime * r_skyspeed * 2.0f;
yshift2 = r_skytime * r_skyspeed * 2.0f;
if ((xshift2 == xlast) && (yshift2 == ylast))
return;
@ -201,15 +200,14 @@ R_SetSkyFrame (void)
int g, s1, s2;
float temp;
skyspeed = iskyspeed;
skyspeed2 = iskyspeed2;
r_skyspeed = iskyspeed;
g = GreatestCommonDivisor (iskyspeed, iskyspeed2);
s1 = iskyspeed / g;
s2 = iskyspeed2 / g;
temp = SKYSIZE * s1 * s2;
skytime = vr_data.realtime - ((int) (vr_data.realtime / temp) * temp);
r_skytime = vr_data.realtime - ((int) (vr_data.realtime / temp) * temp);
r_skymade = 0;
}

View File

@ -40,18 +40,30 @@ static __attribute__ ((used)) const char rcsid[] =
drawsurf_t r_drawsurf;
static int lightleft, blocksize, sourcetstep;
int lightdelta, lightdeltastep;
int lightright, lightleftstep, lightrightstep, blockdivshift;
static int lightright, lightleftstep, lightrightstep, blockdivshift;
static unsigned int blockdivmask;
byte *prowdestbase;
static byte *prowdestbase;
static byte *psource;
static int surfrowbytes;
int *r_lightptr;
int r_stepback;
int r_lightwidth;
static int *r_lightptr;
static int r_stepback;
static int r_lightwidth;
static int r_numhblocks, r_numvblocks;
static byte *r_source, *r_sourcemax;
static void R_DrawSurfaceBlock8_mip0 (void);
static void R_DrawSurfaceBlock8_mip1 (void);
static void R_DrawSurfaceBlock8_mip2 (void);
static void R_DrawSurfaceBlock8_mip3 (void);
static void R_DrawSurfaceBlock16_mip0 (void);
static void R_DrawSurfaceBlock16_mip1 (void);
static void R_DrawSurfaceBlock16_mip2 (void);
static void R_DrawSurfaceBlock16_mip3 (void);
static void R_DrawSurfaceBlock32_mip0 (void);
static void R_DrawSurfaceBlock32_mip1 (void);
static void R_DrawSurfaceBlock32_mip2 (void);
static void R_DrawSurfaceBlock32_mip3 (void);
static void (*surfmiptable8[4]) (void) = {
R_DrawSurfaceBlock8_mip0,
R_DrawSurfaceBlock8_mip1,
@ -291,7 +303,7 @@ R_DrawSurface (void)
//=============================================================================
void
static void
R_DrawSurfaceBlock8_mip0 (void)
{
int v, i, b, lightstep, light;
@ -330,7 +342,7 @@ R_DrawSurfaceBlock8_mip0 (void)
}
}
void
static void
R_DrawSurfaceBlock8_mip1 (void)
{
int v, i, b, lightstep, light;
@ -369,7 +381,7 @@ R_DrawSurfaceBlock8_mip1 (void)
}
}
void
static void
R_DrawSurfaceBlock8_mip2 (void)
{
int v, i, b, lightstep, light;
@ -408,7 +420,7 @@ R_DrawSurfaceBlock8_mip2 (void)
}
}
void
static void
R_DrawSurfaceBlock8_mip3 (void)
{
int v, i, b, lightstep, light;
@ -447,7 +459,7 @@ R_DrawSurfaceBlock8_mip3 (void)
}
}
void
static void
R_DrawSurfaceBlock16_mip0 (void)
{
int k, v;
@ -512,7 +524,7 @@ R_DrawSurfaceBlock16_mip0 (void)
}
}
void
static void
R_DrawSurfaceBlock16_mip1 (void)
{
int k, v;
@ -561,7 +573,7 @@ R_DrawSurfaceBlock16_mip1 (void)
}
}
void
static void
R_DrawSurfaceBlock16_mip2 (void)
{
int k, v;
@ -602,7 +614,7 @@ R_DrawSurfaceBlock16_mip2 (void)
}
}
void
static void
R_DrawSurfaceBlock16_mip3 (void)
{
int v;
@ -637,7 +649,7 @@ R_DrawSurfaceBlock16_mip3 (void)
}
}
void
static void
R_DrawSurfaceBlock32_mip0 (void)
{
int k, v;
@ -702,7 +714,7 @@ R_DrawSurfaceBlock32_mip0 (void)
}
}
void
static void
R_DrawSurfaceBlock32_mip1 (void)
{
int k, v;
@ -751,7 +763,7 @@ R_DrawSurfaceBlock32_mip1 (void)
}
}
void
static void
R_DrawSurfaceBlock32_mip2 (void)
{
int k, v;
@ -792,7 +804,7 @@ R_DrawSurfaceBlock32_mip2 (void)
}
}
void
static void
R_DrawSurfaceBlock32_mip3 (void)
{
int v;
@ -868,8 +880,3 @@ R_DrawSurfaceBlock32 (void)
}
}
*/
void
R_SurfacePatch (void)
{
}