Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
SRB2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
STJr
SRB2
Commits
ebc22b9d
Commit
ebc22b9d
authored
5 years ago
by
Lactozilla
Browse files
Options
Downloads
Patches
Plain Diff
yet even more cleanup here
parent
da93e0f1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!734
Rebase Keycodes only branch.
,
!550
Renderer switching
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/d_main.c
+1
-5
1 addition, 5 deletions
src/d_main.c
src/screen.c
+10
-5
10 additions, 5 deletions
src/screen.c
src/screen.h
+3
-0
3 additions, 0 deletions
src/screen.h
with
14 additions
and
10 deletions
src/d_main.c
+
1
−
5
View file @
ebc22b9d
...
...
@@ -1228,11 +1228,7 @@ void D_SRB2Main(void)
needpatchflush
=
true
;
needpatchrecache
=
true
;
VID_CheckRenderer
();
// set cv_renderer back
if
(
setrenderneeded
==
render_soft
)
CV_StealthSetValue
(
&
cv_renderer
,
1
);
else
if
(
setrenderneeded
==
render_opengl
)
CV_StealthSetValue
(
&
cv_renderer
,
2
);
SCR_ChangeRendererCVars
(
setrenderneeded
);
}
D_CheckRendererState
();
...
...
This diff is collapsed.
Click to expand it.
src/screen.c
+
10
−
5
View file @
ebc22b9d
...
...
@@ -72,7 +72,6 @@ consvar_t cv_scr_depth = {"scr_depth", "16 bits", CV_SAVE, scr_depth_cons_t, NUL
#endif
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
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
};
...
...
@@ -430,10 +429,7 @@ void SCR_ChangeRenderer(void)
else
if
(
M_CheckParm
(
"-software"
))
target_renderer
=
rendermode
=
render_soft
;
// set cv_renderer back
if
(
rendermode
==
render_soft
)
CV_StealthSetValue
(
&
cv_renderer
,
1
);
else
if
(
rendermode
==
render_opengl
)
CV_StealthSetValue
(
&
cv_renderer
,
2
);
SCR_ChangeRendererCVars
(
rendermode
);
return
;
}
...
...
@@ -444,6 +440,15 @@ void SCR_ChangeRenderer(void)
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
)
{
return
...
...
This diff is collapsed.
Click to expand it.
src/screen.h
+
3
−
0
View file @
ebc22b9d
...
...
@@ -154,6 +154,9 @@ extern boolean R_SSE2;
// ----------------
extern
viddef_t
vid
;
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
scr_bpp
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment