diff --git a/Globals.cpp b/Globals.cpp index 361dc927..dcab5d03 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -413,8 +413,12 @@ global_settings::ConfigParse(cParser &Parser) { { GfxRenderer = "default"; } + if (GfxRenderer == "experimental") + { + NvRenderer = true; + GfxRenderer = "experimental"; + } BasicRenderer = (GfxRenderer == "simple"); - NvRenderer = GfxRenderer == "experimental"; LegacyRenderer = !NvRenderer && (GfxRenderer != "default"); } else if (token == "shadows") diff --git a/application.cpp b/application.cpp index 89f8b528..888867e5 100644 --- a/application.cpp +++ b/application.cpp @@ -1062,18 +1062,12 @@ eu07_application::init_gfx() { if( Global.GfxRenderer == "default" ) { // default render path - //GfxRenderer = gfx_renderer_factory::get_instance()->create("modern"); - GfxRenderer = gfx_renderer_factory::get_instance()->create("advanced"); + GfxRenderer = gfx_renderer_factory::get_instance()->create("modern"); } - //else if (!Global.GfxRenderer.compare(0, 5, "manul")) - //{ - // //GfxRenderer = gfx_renderer_factory::get_instance()->create(Global.GfxRenderer); - //} - else if (Global.GfxRenderer == "legacy") + else if (Global.GfxRenderer == "experimental") { - // move old gl3.3 renderer to legacy one - GfxRenderer = gfx_renderer_factory::get_instance()->create("modern"); - } + GfxRenderer = gfx_renderer_factory::get_instance()->create(Global.GfxRenderer); + } else { // legacy render path GfxRenderer = gfx_renderer_factory::get_instance()->create("legacy"); diff --git a/betterRenderer/eu07_source/register.cpp b/betterRenderer/eu07_source/register.cpp index cdaf20ca..88a9d2b5 100644 --- a/betterRenderer/eu07_source/register.cpp +++ b/betterRenderer/eu07_source/register.cpp @@ -22,10 +22,10 @@ std::unique_ptr create_nvrenderer_default() { bool register_manul_d3d12 = LIBMANUL_WITH_D3D12 && gfx_renderer_factory::get_instance()->register_backend( - "advanced_d3d12", &create_nvrenderer_for_d3d12); + "experimental_d3d12", &create_nvrenderer_for_d3d12); bool register_manul_vulkan = LIBMANUL_WITH_VULKAN && gfx_renderer_factory::get_instance()->register_backend( - "advanced_vk", &create_nvrenderer_for_vulkan); + "experimental_vk", &create_nvrenderer_for_vulkan); bool register_manul = gfx_renderer_factory::get_instance()->register_backend( - "advanced", &create_nvrenderer_default); \ No newline at end of file + "experimental", &create_nvrenderer_default); \ No newline at end of file