godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #103286 from AThousandShips/fix_windows_display_2 

[Windows] Fix unreachable code in `DisplayServer`
This commit is contained in:
Thaddeus Crews 2025-02-25 12:42:39 -06:00 committed by GitHub
parent cc7a951140 8ea725a181
commit 6ea7798789
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
servers/display_server.cpp
View File

@ -1344,9 +1344,8 @@ bool DisplayServer::is_rendering_device_supported() {
return true; return true;
} else { } else {
supported_rendering_device = RenderingDeviceCreationStatus::FAILURE; supported_rendering_device = RenderingDeviceCreationStatus::FAILURE;
return false;
} }
#endif #else // WINDOWS_ENABLED
RenderingContextDriver *rcd = nullptr; RenderingContextDriver *rcd = nullptr;
@ -1391,6 +1390,7 @@ bool DisplayServer::is_rendering_device_supported() {
rcd = nullptr; rcd = nullptr;
} }
#endif // WINDOWS_ENABLED
#endif // RD_ENABLED #endif // RD_ENABLED
return false; return false;
} }
@ -1427,9 +1427,8 @@ bool DisplayServer::can_create_rendering_device() {
return true; return true;
} else { } else {
created_rendering_device = RenderingDeviceCreationStatus::FAILURE; created_rendering_device = RenderingDeviceCreationStatus::FAILURE;
return false;
} }
#endif #else // WINDOWS_ENABLED
RenderingContextDriver *rcd = nullptr; RenderingContextDriver *rcd = nullptr;
@ -1474,6 +1473,7 @@ bool DisplayServer::can_create_rendering_device() {
rcd = nullptr; rcd = nullptr;
} }
#endif // WINDOWS_ENABLED
#endif // RD_ENABLED #endif // RD_ENABLED
return false; return false;
} }