2
0
Эх сурвалжийг харах

Move code to Windows Vulkan context initialization context

This workaround is not needed for rendering drivers other than Vulkan.

(cherry picked from commit 950c5b57e498c81309f27d2e6114d2653a9b6bdd)
Hugo Locurcio 2 жил өмнө
parent
commit
e46b14fd30

+ 0 - 5
platform/windows/os_windows.cpp

@@ -156,11 +156,6 @@ static void _error_handler(void *p_self, const char *p_func, const char *p_file,
 void OS_Windows::initialize() {
 	crash_handler.initialize();
 
-	// Workaround for Vulkan not working on setups with AMD integrated graphics + NVIDIA dedicated GPU (GH-57708).
-	// This prevents using AMD integrated graphics with Vulkan entirely, but it allows the engine to start
-	// even on outdated/broken driver setups.
-	OS::get_singleton()->set_environment("DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1", "1");
-
 #ifdef WINDOWS_DEBUG_OUTPUT_ENABLED
 	error_handlers.errfunc = _error_handler;
 	error_handlers.userdata = this;

+ 4 - 0
platform/windows/vulkan_context_win.cpp

@@ -55,6 +55,10 @@ Error VulkanContextWindows::window_create(DisplayServer::WindowID p_window_id, D
 }
 
 VulkanContextWindows::VulkanContextWindows() {
+	// Workaround for Vulkan not working on setups with AMD integrated graphics + NVIDIA dedicated GPU (GH-57708).
+	// This prevents using AMD integrated graphics with Vulkan entirely, but it allows the engine to start
+	// even on outdated/broken driver setups.
+	OS::get_singleton()->set_environment("DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1", "1");
 }
 
 VulkanContextWindows::~VulkanContextWindows() {