Merge pull request #71515 from akien-mga/disable-mangohud-editor
Force disable Vulkan overlays in the editor and project manager
This commit is contained in:
commit
cd0a9ccdfd
1 changed files with 12 additions and 1 deletions
|
@ -1677,10 +1677,21 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
|
|||
OS::get_singleton()->_allow_hidpi = GLOBAL_DEF("display/window/dpi/allow_hidpi", true);
|
||||
OS::get_singleton()->_allow_layered = GLOBAL_DEF("display/window/per_pixel_transparency/allowed", false);
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
if (editor || project_manager) {
|
||||
// The editor and project manager always detect and use hiDPI if needed
|
||||
// The editor and project manager always detect and use hiDPI if needed.
|
||||
OS::get_singleton()->_allow_hidpi = true;
|
||||
// Disable Vulkan overlays in editor, they cause various issues.
|
||||
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_VKBASALT", "1");
|
||||
} else {
|
||||
// Re-allow using Vulkan overlays, disabled while using the editor.
|
||||
OS::get_singleton()->unset_environment("DISABLE_MANGOHUD");
|
||||
OS::get_singleton()->unset_environment("DISABLE_RTSS_LAYER");
|
||||
OS::get_singleton()->unset_environment("DISABLE_VKBASALT");
|
||||
}
|
||||
#endif
|
||||
|
||||
if (rtm == -1) {
|
||||
rtm = GLOBAL_DEF("rendering/driver/threads/thread_model", OS::RENDER_THREAD_SAFE);
|
||||
|
|
Loading…
Reference in a new issue