eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-30 10:50:28 +01:00
Code Issues 154 Wiki Activity

feat(vulkan): gfxrenderer picks the opengl 4.6 or the vulkan 1.4 renderer (B1-B3)

Browse Source
This commit is contained in:
Hirek
2026-10-24 03:06:33 +02:00
parent 6bcdb7dd05
commit 68fa5dc2da
25 changed files with 3056 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
utilities/Globals.cpp
View File

@@ -317,10 +317,13 @@ bool global_settings::ConfigParseGraphics(cParser& Parser, const std::string& to
{
ParseOne(Parser, GfxRenderer);
if (GfxRenderer == "full")
// "default": the opengl 4.6 renderer, "vulkan": the vulkan 1.4 one (opengl when it can't run on the machine)
if ((GfxRenderer == "full") || (GfxRenderer == "opengl") || (GfxRenderer == "gl46"))
GfxRenderer = "default";
else if (GfxRenderer == "vulkan14")
GfxRenderer = "vulkan";
if (GfxRenderer != "default")
if ((GfxRenderer != "default") && (GfxRenderer != "vulkan"))
{
// the legacy OpenGL 2.1 renderer ("legacy", "simple" and other values) and the NVRHI renderer ("experimental") were removed
WriteLog("eu07.ini: gfxrenderer \"" + GfxRenderer + "\" is no longer supported, using \"default\"");
@@ -1741,6 +1744,26 @@ global_settings::ConfigParse_gfx( cParser &Parser, std::string_view const Token
Parser >> gfx_shadow_sdsm_split;
gfx_shadow_sdsm_split = std::clamp(gfx_shadow_sdsm_split, 0.f, 1.f);
}
else if (Token == "gfx.vulkan.device")
{
// index of the gpu in the list of the log, or a part of its name
Parser.getTokens(1, false);
Parser >> gfx_vulkan_device;
}
else if (Token == "gfx.vulkan.validation")
{
// no/yes, 2: also gpu-assisted
std::string value;
Parser.getTokens(1);
Parser >> value;
gfx_vulkan_validation = (value == "2" ? 2 : (value == "yes" || value == "true" || value == "1") ? 1 : 0);
}
else if (Token == "gfx.vulkan.framesinflight")
{
Parser.getTokens(1);
Parser >> gfx_vulkan_framesinflight;
gfx_vulkan_framesinflight = std::clamp(gfx_vulkan_framesinflight, 2, 3);
}
else if (ConfigParse_gfx_sky(Parser, Token))
{
// parsed
@@ -2158,6 +2181,9 @@ global_settings::export_as_text( std::ostream &Output ) const {
export_as_text( Output, "gfx.skippipeline", gfx_skippipeline );
export_as_text( Output, "gfx.extraeffects", gfx_extraeffects );
export_as_text( Output, "gfx.shadergamma", gfx_shadergamma );
export_as_text( Output, "gfx.vulkan.device", gfx_vulkan_device );
export_as_text( Output, "gfx.vulkan.validation", gfx_vulkan_validation );
export_as_text( Output, "gfx.vulkan.framesinflight", gfx_vulkan_framesinflight );
export_as_text( Output, "gfx.shadow.angle.min", gfx_shadow_angle_min );
export_as_text( Output, "gfx.shadow.rank.cutoff", gfx_shadow_rank_cutoff );
export_as_text( Output, "gfx.shadow.sdsm", gfx_shadow_sdsm );