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

GL rendering path audit.

Browse source
This commit is contained in:
Zephaniah E. Hull 2000-09-30 02:46:48 +00:00
parent 8601bc905b
commit cb0d141132
5 changed files with 6 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/gl_rlight.c
View file

@ -297,7 +297,7 @@ void R_PushDlights (vec3_t entorigin)
dlight_t *l; dlight_t *l;
vec3_t lightorigin; vec3_t lightorigin;
if (gl_flashblend->value) if (gl_flashblend->int_val)
return; return;
r_dlightframecount = r_framecount + 1; // because the count hasn't r_dlightframecount = r_framecount + 1; // because the count hasn't

4
source/gl_rmain.c
View file

@ -46,8 +46,6 @@
entity_t r_worldentity; entity_t r_worldentity;
qboolean r_cache_thrash; // compatability
vec3_t modelorg, r_entorigin; vec3_t modelorg, r_entorigin;
entity_t *currententity; entity_t *currententity;
@ -822,8 +820,6 @@ static void R_SetupFrame (void)
V_SetContentsColor (r_viewleaf->contents); V_SetContentsColor (r_viewleaf->contents);
V_CalcBlend (); V_CalcBlend ();
r_cache_thrash = false;
c_brush_polys = 0; c_brush_polys = 0;
c_alias_polys = 0; c_alias_polys = 0;

68
source/gl_screen.c
View file

@ -151,7 +151,6 @@ viddef_t vid; // global video state
vrect_t scr_vrect; vrect_t scr_vrect;
qboolean scr_disabled_for_loading; qboolean scr_disabled_for_loading;
qboolean scr_drawloading;
float scr_disabled_time; float scr_disabled_time;
qboolean block_drawing; qboolean block_drawing;
@ -441,22 +440,6 @@ SCR_Init (void)
/*
==============
SCR_DrawRam
==============
*/
void SCR_DrawRam (void)
{
if (!scr_showram->value)
return;
if (!r_cache_thrash)
return;
Draw_Pic (scr_vrect.x+32, scr_vrect.y, scr_ram);
}
/* /*
============== ==============
SCR_DrawTurtle SCR_DrawTurtle
@ -544,27 +527,6 @@ void SCR_DrawPause (void)
(vid.height - 48 - pic->height)/2, pic); (vid.height - 48 - pic->height)/2, pic);
} }
/*
==============
SCR_DrawLoading
==============
*/
void SCR_DrawLoading (void)
{
qpic_t *pic;
if (!scr_drawloading)
return;
pic = Draw_CachePic ("gfx/loading.lmp");
Draw_Pic ( (vid.width - pic->width)/2,
(vid.height - 48 - pic->height)/2, pic);
}
//============================================================================= //=============================================================================
@ -577,9 +539,6 @@ void SCR_SetUpToDrawConsole (void)
{ {
Con_CheckResize (); Con_CheckResize ();
if (scr_drawloading)
return; // never a console with loading plaque
// decide on the height of the console // decide on the height of the console
if (cls.state != ca_active) if (cls.state != ca_active)
{ {
@ -985,7 +944,6 @@ void SCR_RSShot_f (void)
//============================================================================= //=============================================================================
char *scr_notifystring; char *scr_notifystring;
qboolean scr_drawdialog;
void SCR_DrawNotifyString (void) void SCR_DrawNotifyString (void)
{ {
@ -1146,33 +1104,15 @@ void SCR_UpdateScreen (void)
if (r_netgraph->value) if (r_netgraph->value)
R_NetGraph (); R_NetGraph ();
if (scr_drawdialog) if (cl.intermission == 1 && key_dest == key_game) {
{
Sbar_Draw ();
Draw_FadeScreen ();
SCR_DrawNotifyString ();
scr_copyeverything = true;
}
else if (scr_drawloading)
{
SCR_DrawLoading ();
Sbar_Draw ();
}
else if (cl.intermission == 1 && key_dest == key_game)
{
Sbar_IntermissionOverlay (); Sbar_IntermissionOverlay ();
} } else if (cl.intermission == 2 && key_dest == key_game) {
else if (cl.intermission == 2 && key_dest == key_game)
{
Sbar_FinaleOverlay (); Sbar_FinaleOverlay ();
SCR_CheckDrawCenterString (); SCR_CheckDrawCenterString ();
} } else {
else if (crosshair->int_val)
{
if (crosshair->value)
Draw_Crosshair(); Draw_Crosshair();
SCR_DrawRam ();
SCR_DrawNet (); SCR_DrawNet ();
SCR_DrawFPS (); SCR_DrawFPS ();
SCR_DrawTurtle (); SCR_DrawTurtle ();

12
source/sbar.c
View file

@ -853,18 +853,6 @@ void Sbar_Draw (void)
if (sb_showscores || sb_showteamscores || if (sb_showscores || sb_showteamscores ||
cl.stats[STAT_HEALTH] <= 0) cl.stats[STAT_HEALTH] <= 0)
sb_updates = 0; sb_updates = 0;
// clear unused areas in gl
#if 0
{
int x = (vid.width - 320)>>1;
// left
if (x > 0) {
Draw_TileClear (0, vid.height - sb_lines, x, sb_lines);
Draw_TileClear (x+320, vid.height - sb_lines, vid.width - x+320, sb_lines);
}
}
#endif
if (vid.width > 320 && !headsup) if (vid.width > 320 && !headsup)
Draw_TileClear (320, vid.height - sb_lines, vid.width - 320, sb_lines); Draw_TileClear (320, vid.height - sb_lines, vid.width - 320, sb_lines);

10
source/screen.c
View file

@ -930,7 +930,6 @@ void SCR_RSShot_f (void)
//============================================================================= //=============================================================================
char *scr_notifystring; char *scr_notifystring;
qboolean scr_drawdialog;
void SCR_DrawNotifyString (void) void SCR_DrawNotifyString (void)
{ {
@ -1064,14 +1063,7 @@ void SCR_UpdateScreen (void)
D_EnableBackBufferAccess (); // of all overlay stuff if drawing directly D_EnableBackBufferAccess (); // of all overlay stuff if drawing directly
if (scr_drawdialog) if (cl.intermission == 1 && key_dest == key_game)
{
Sbar_Draw ();
Draw_FadeScreen ();
SCR_DrawNotifyString ();
scr_copyeverything = true;
}
else if (cl.intermission == 1 && key_dest == key_game)
{ {
Sbar_IntermissionOverlay (); Sbar_IntermissionOverlay ();
} }