qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-03-20 01:11:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Complete the move of some vars into vid_render_data.

Browse source 
scr_fullupdate and scr_copyeverything were missed. Possibly others too, but
this is enough for the moment.
This commit is contained in:
Bill Currie 2013-01-13 16:46:41 +09:00
parent 9c812f39ce
commit 86b95629cf
5 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/r_screen.h
View file

@ -47,7 +47,6 @@ void SCR_DrawStringToSnap (const char *s, struct tex_s *tex, int x, int y);
extern int scr_copytop;
extern int scr_copyeverything;
extern float scr_con_current;
extern float scr_conlines; // lines of console to display
@ -62,8 +61,6 @@ extern struct qpic_s *scr_ram;
extern struct qpic_s *scr_net;
extern struct qpic_s *scr_turtle;
extern int scr_fullupdate;
extern int clearconsole;
extern int clearnotify;

2
libs/video/renderer/gl/gl_screen.c
View file

@ -213,7 +213,7 @@ gl_SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
vid.numpages = 2 + gl_triplebuffer->int_val;
scr_copytop = 0;
scr_copyeverything = 0;
vr_data.scr_copyeverything = 0;
if (!scr_initialized)
return; // not initialized yet

5
libs/video/renderer/r_screen.c
View file

@ -92,7 +92,6 @@
// only the refresh window will be updated unless these variables are flagged
int scr_copytop;
int scr_copyeverything;
byte *draw_chars; // 8*8 graphic characters FIXME location
float oldfov;
@ -103,8 +102,6 @@ qboolean scr_initialized; // ready to draw
qpic_t *scr_ram;
qpic_t *scr_turtle;
int scr_fullupdate;
int clearconsole;
viddef_t vid; // global video state
@ -154,7 +151,7 @@ SCR_CalcRefdef (void)
refdef_t *refdef = r_data->refdef;
// force a background redraw
scr_fullupdate = 0;
vr_data.scr_fullupdate = 0;
vid.recalc_refdef = 0;
// bound field of view

8
libs/video/renderer/sw/screen.c
View file

@ -197,7 +197,7 @@ SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
vr_data.realtime = realtime;
scr_copytop = 0;
scr_copyeverything = 0;
vr_data.scr_copyeverything = 0;
if (!scr_initialized)
return; // not initialized yet
@ -214,8 +214,8 @@ SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
D_EnableBackBufferAccess (); // of all overlay stuff if drawing
// directly
if (scr_fullupdate++ < vid.numpages) { // clear the entire screen
scr_copyeverything = 1;
if (vr_data.scr_fullupdate++ < vid.numpages) { // clear the entire screen
vr_data.scr_copyeverything = 1;
Draw_TileClear (0, 0, vid.width, vid.height);
}
@ -244,7 +244,7 @@ SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
}
// update one of three areas
if (scr_copyeverything) {
if (vr_data.scr_copyeverything) {
vrect.x = 0;
vrect.y = 0;
vrect.width = vid.width;

8
libs/video/renderer/sw32/screen.c
View file

@ -155,7 +155,7 @@ sw32_SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs
vr_data.realtime = realtime;
scr_copytop = 0;
scr_copyeverything = 0;
vr_data.scr_copyeverything = 0;
if (!scr_initialized)
return; // not initialized yet
@ -172,8 +172,8 @@ sw32_SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs
sw32_D_EnableBackBufferAccess (); // of all overlay stuff if drawing
// directly
if (scr_fullupdate++ < vid.numpages) { // clear the entire screen
scr_copyeverything = 1;
if (vr_data.scr_fullupdate++ < vid.numpages) { // clear the entire screen
vr_data.scr_copyeverything = 1;
sw32_Draw_TileClear (0, 0, vid.width, vid.height);
}
@ -202,7 +202,7 @@ sw32_SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs
}
// update one of three areas
if (scr_copyeverything) {
if (vr_data.scr_copyeverything) {
vrect.x = 0;
vrect.y = 0;
vrect.width = vid.width;