Merge pull request #88316 from Calinou/vulkan-disable-reshade-editor

Disable ReShade in the editor and project manager (if run via Vulkan)
This commit is contained in:
Rémi Verschelde 2024-02-14 10:59:55 +01:00
commit 1133c16447
No known key found for this signature in database
GPG key ID: C3336907360768E1

View file

@ -2208,11 +2208,13 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
OS::get_singleton()->set_environment("DISABLE_MANGOHUD", "1"); // GH-57403. OS::get_singleton()->set_environment("DISABLE_MANGOHUD", "1"); // GH-57403.
OS::get_singleton()->set_environment("DISABLE_RTSS_LAYER", "1"); // GH-57937. OS::get_singleton()->set_environment("DISABLE_RTSS_LAYER", "1"); // GH-57937.
OS::get_singleton()->set_environment("DISABLE_VKBASALT", "1"); OS::get_singleton()->set_environment("DISABLE_VKBASALT", "1");
OS::get_singleton()->set_environment("DISABLE_VK_LAYER_reshade_1", "1"); // GH-70849.
} else { } else {
// Re-allow using Vulkan overlays, disabled while using the editor. // Re-allow using Vulkan overlays, disabled while using the editor.
OS::get_singleton()->unset_environment("DISABLE_MANGOHUD"); OS::get_singleton()->unset_environment("DISABLE_MANGOHUD");
OS::get_singleton()->unset_environment("DISABLE_RTSS_LAYER"); OS::get_singleton()->unset_environment("DISABLE_RTSS_LAYER");
OS::get_singleton()->unset_environment("DISABLE_VKBASALT"); OS::get_singleton()->unset_environment("DISABLE_VKBASALT");
OS::get_singleton()->unset_environment("DISABLE_VK_LAYER_reshade_1");
} }
#endif #endif