summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrey Nazarov <skuller@skuller.net>2013-03-16 02:24:31 +0400
committerAndrey Nazarov <skuller@skuller.net>2013-03-19 03:44:50 +0400
commit3d42e612e1eb3bcee520b2fb626cedd025a75861 (patch)
tree89f98e9422d63aaedf4f3d44f669fce1373cfd7e /src
parent6e5aa4dec92010a3794152a379d95f62fb8cc029 (diff)
Remove ‘r_dspeeds’ variable.
Diffstat (limited to 'src')
-rw-r--r--src/refresh/sw/main.c42
-rw-r--r--src/refresh/sw/misc.c24
-rw-r--r--src/refresh/sw/sw.h4
3 files changed, 1 insertions, 69 deletions
diff --git a/src/refresh/sw/main.c b/src/refresh/sw/main.c
index 13ce08d..5b483af 100644
--- a/src/refresh/sw/main.c
+++ b/src/refresh/sw/main.c
@@ -85,9 +85,6 @@ int r_frustum_indexes[4 * 6];
mleaf_t *r_viewleaf;
int r_viewcluster, r_oldviewcluster;
-float da_time1, da_time2, dp_time1, dp_time2, db_time1, db_time2, rw_time1, rw_time2;
-float se_time1, se_time2, de_time1, de_time2;
-
void R_MarkLeaves(void);
cvar_t *sw_aliasstats;
@@ -113,7 +110,6 @@ cvar_t *sw_drawsird;
cvar_t *r_drawworld;
cvar_t *r_drawentities;
-cvar_t *r_dspeeds;
cvar_t *r_fullbright;
cvar_t *r_lerpmodels;
cvar_t *r_novis;
@@ -197,7 +193,6 @@ void R_Register(void)
r_fullbright = Cvar_Get("r_fullbright", "0", CVAR_CHEAT);
r_drawentities = Cvar_Get("r_drawentities", "1", 0);
r_drawworld = Cvar_Get("r_drawworld", "1", CVAR_CHEAT);
- r_dspeeds = Cvar_Get("r_dspeeds", "0", 0);
r_lerpmodels = Cvar_Get("r_lerpmodels", "1", 0);
r_novis = Cvar_Get("r_novis", "0", 0);
@@ -782,24 +777,11 @@ void R_EdgeDrawing(void)
R_BeginEdgeFrame();
- if (r_dspeeds->integer) {
- rw_time1 = Sys_Milliseconds();
- }
R_RenderWorld();
- if (r_dspeeds->integer) {
- rw_time2 = Sys_Milliseconds();
- db_time1 = rw_time2;
- }
-
R_DrawBEntitiesOnList();
- if (r_dspeeds->integer) {
- db_time2 = Sys_Milliseconds();
- se_time1 = db_time2;
- }
-
R_ScanEdges();
}
@@ -863,7 +845,7 @@ void R_RenderFrame(refdef_t *fd)
if (!sw_dynamic->integer)
r_newrefdef.num_dlights = 0;
- if (r_speeds->integer || r_dspeeds->integer)
+ if (r_speeds->integer)
r_time1 = Sys_Milliseconds();
R_SetupFrame();
@@ -875,23 +857,10 @@ void R_RenderFrame(refdef_t *fd)
R_EdgeDrawing();
- if (r_dspeeds->integer) {
- se_time2 = Sys_Milliseconds();
- de_time1 = se_time2;
- }
-
R_DrawEntitiesOnList();
- if (r_dspeeds->integer) {
- de_time2 = Sys_Milliseconds();
- dp_time1 = Sys_Milliseconds();
- }
-
R_DrawParticles();
- if (r_dspeeds->integer)
- dp_time2 = Sys_Milliseconds();
-
R_DrawAlphaSurfaces();
//Start Replaced by Lewey
@@ -905,21 +874,12 @@ void R_RenderFrame(refdef_t *fd)
}
//End Replaced by Lewey
- if (r_dspeeds->integer)
- da_time1 = Sys_Milliseconds();
-
- if (r_dspeeds->integer)
- da_time2 = Sys_Milliseconds();
-
if (sw_aliasstats->integer)
R_PrintAliasStats();
if (r_speeds->integer)
R_PrintTimes();
- if (r_dspeeds->integer)
- R_PrintDSpeeds();
-
if (sw_reportsurfout->integer && r_outofsurfaces)
Com_Printf("Short %d surfaces\n", r_outofsurfaces);
diff --git a/src/refresh/sw/misc.c b/src/refresh/sw/misc.c
index 755b5fe..e1b0964 100644
--- a/src/refresh/sw/misc.c
+++ b/src/refresh/sw/misc.c
@@ -105,30 +105,6 @@ void R_PrintTimes(void)
/*
=============
-R_PrintDSpeeds
-=============
-*/
-void R_PrintDSpeeds(void)
-{
- int ms, dp_time, r_time2, rw_time, db_time, se_time, de_time, da_time;
-
- r_time2 = Sys_Milliseconds();
-
- da_time = (da_time2 - da_time1);
- dp_time = (dp_time2 - dp_time1);
- rw_time = (rw_time2 - rw_time1);
- db_time = (db_time2 - db_time1);
- se_time = (se_time2 - se_time1);
- de_time = (de_time2 - de_time1);
- ms = (r_time2 - r_time1);
-
- Com_Printf("%3i %2ip %2iw %2ib %2is %2ie %2ia\n",
- ms, dp_time, rw_time, db_time, se_time, de_time, da_time);
-}
-
-
-/*
-=============
R_PrintAliasStats
=============
*/
diff --git a/src/refresh/sw/sw.h b/src/refresh/sw/sw.h
index 603aa3c..4a8643f 100644
--- a/src/refresh/sw/sw.h
+++ b/src/refresh/sw/sw.h
@@ -462,7 +462,6 @@ extern cvar_t *sw_modulate;
extern cvar_t *r_fullbright;
extern cvar_t *r_drawentities;
extern cvar_t *r_drawworld;
-extern cvar_t *r_dspeeds;
extern cvar_t *r_lerpmodels;
extern cvar_t *r_speeds;
@@ -601,9 +600,6 @@ void R_AliasClipTriangle(finalvert_t *index0, finalvert_t *index1, finalvert_t *
extern float r_time1;
-extern float da_time1, da_time2;
-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, r_cnumsurfs;
extern qboolean r_surfsonstack;