stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-31 21:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

yet even more cleanup here

Browse source
This commit is contained in:
Jaime Passos 2019-09-09 16:31:30 -03:00
parent da93e0f1f5
commit ebc22b9df8
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/d_main.c
View file

@ -1228,11 +1228,7 @@ void D_SRB2Main(void)
needpatchflush = true; needpatchflush = true;
needpatchrecache = true; needpatchrecache = true;
VID_CheckRenderer(); VID_CheckRenderer();
// set cv_renderer back SCR_ChangeRendererCVars(setrenderneeded);
if (setrenderneeded == render_soft)
CV_StealthSetValue(&cv_renderer, 1);
else if (setrenderneeded == render_opengl)
CV_StealthSetValue(&cv_renderer, 2);
} }
D_CheckRendererState(); D_CheckRendererState();

15
src/screen.c
View file

@ -72,7 +72,6 @@ consvar_t cv_scr_depth = {"scr_depth", "16 bits", CV_SAVE, scr_depth_cons_t, NUL
#endif #endif
consvar_t cv_renderview = {"renderview", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_renderview = {"renderview", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
static void SCR_ChangeRenderer(void);
static void SCR_ActuallyChangeRenderer(void); static void SCR_ActuallyChangeRenderer(void);
static CV_PossibleValue_t cv_renderer_t[] = {{1, "Software"}, {2, "OpenGL"}, {0, NULL}}; static CV_PossibleValue_t cv_renderer_t[] = {{1, "Software"}, {2, "OpenGL"}, {0, NULL}};
consvar_t cv_renderer = {"renderer", "Software", CV_SAVE|CV_CALL, cv_renderer_t, SCR_ChangeRenderer, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_renderer = {"renderer", "Software", CV_SAVE|CV_CALL, cv_renderer_t, SCR_ChangeRenderer, 0, NULL, NULL, 0, 0, NULL};
@ -430,10 +429,7 @@ void SCR_ChangeRenderer(void)
else if (M_CheckParm("-software")) else if (M_CheckParm("-software"))
target_renderer = rendermode = render_soft; target_renderer = rendermode = render_soft;
// set cv_renderer back // set cv_renderer back
if (rendermode == render_soft) SCR_ChangeRendererCVars(rendermode);
CV_StealthSetValue(&cv_renderer, 1);
else if (rendermode == render_opengl)
CV_StealthSetValue(&cv_renderer, 2);
return; return;
} }
@ -444,6 +440,15 @@ void SCR_ChangeRenderer(void)
SCR_ActuallyChangeRenderer(); SCR_ActuallyChangeRenderer();
} }
void SCR_ChangeRendererCVars(INT32 mode)
{
// set cv_renderer back
if (mode == render_soft)
CV_StealthSetValue(&cv_renderer, 1);
else if (mode == render_opengl)
CV_StealthSetValue(&cv_renderer, 2);
}
boolean SCR_IsAspectCorrect(INT32 width, INT32 height) boolean SCR_IsAspectCorrect(INT32 width, INT32 height)
{ {
return return

3
src/screen.h
View file

@ -154,6 +154,9 @@ extern boolean R_SSE2;
// ---------------- // ----------------
extern viddef_t vid; extern viddef_t vid;
extern INT32 setmodeneeded; // mode number to set if needed, or 0 extern INT32 setmodeneeded; // mode number to set if needed, or 0
void SCR_ChangeRenderer(void);
void SCR_ChangeRendererCVars(INT32 mode);
extern INT32 setrenderneeded; extern INT32 setrenderneeded;
extern INT32 scr_bpp; extern INT32 scr_bpp;