From 8b855edaf554dedf443c5a731d297cc8b9c5a3e5 Mon Sep 17 00:00:00 2001 From: Hirek Date: Sun, 13 Apr 2025 17:12:07 +0200 Subject: [PATCH] Move nvrhi renderer as default (gl3.3 is legacy now) --- application.cpp | 16 +++++++++++----- manul/eu07_source/register.cpp | 8 ++++---- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/application.cpp b/application.cpp index e0771fa2..84445573 100644 --- a/application.cpp +++ b/application.cpp @@ -1059,12 +1059,18 @@ 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("modern"); + GfxRenderer = gfx_renderer_factory::get_instance()->create("advanced"); + } + //else if (!Global.GfxRenderer.compare(0, 5, "manul")) + //{ + // //GfxRenderer = gfx_renderer_factory::get_instance()->create(Global.GfxRenderer); + //} + else if (Global.GfxRenderer == "legacy") + { + // move old gl3.3 renderer to legacy one + 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 { // legacy render path GfxRenderer = gfx_renderer_factory::get_instance()->create("legacy"); diff --git a/manul/eu07_source/register.cpp b/manul/eu07_source/register.cpp index 822a9cb8..cdaf20ca 100644 --- a/manul/eu07_source/register.cpp +++ b/manul/eu07_source/register.cpp @@ -14,7 +14,7 @@ std::unique_ptr create_nvrenderer_default() { #elif LIBMANUL_WITH_VULKAN return std::make_unique(NvRenderer::Api::Vulkan); #endif - ErrorLog("Failed to initialize any Manul Renderer"); + ErrorLog("Failed to initialize any NVRHI Renderer"); return nullptr; } } // namespace @@ -22,10 +22,10 @@ std::unique_ptr create_nvrenderer_default() { bool register_manul_d3d12 = LIBMANUL_WITH_D3D12 && gfx_renderer_factory::get_instance()->register_backend( - "manul_d3d12", &create_nvrenderer_for_d3d12); + "advanced_d3d12", &create_nvrenderer_for_d3d12); bool register_manul_vulkan = LIBMANUL_WITH_VULKAN && gfx_renderer_factory::get_instance()->register_backend( - "manul_vulkan", &create_nvrenderer_for_vulkan); + "advanced_vk", &create_nvrenderer_for_vulkan); bool register_manul = gfx_renderer_factory::get_instance()->register_backend( - "manul", &create_nvrenderer_default); \ No newline at end of file + "advanced", &create_nvrenderer_default); \ No newline at end of file