Merge pull request #106400 from RandomShaper/win_compat

Improve platform compatibility of Windows and Direct3D 12
This commit is contained in:
Thaddeus Crews 2025-05-15 10:22:16 -05:00
commit 902d2b45bb
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
10 changed files with 44 additions and 1 deletions

View file

@ -1197,6 +1197,7 @@ String OS_LinuxBSD::get_system_ca_certificates() {
return f->get_as_text();
}
#ifdef TOOLS_ENABLED
bool OS_LinuxBSD::_test_create_rendering_device(const String &p_display_driver) const {
// Tests Rendering Device creation.
@ -1263,6 +1264,7 @@ bool OS_LinuxBSD::_test_create_rendering_device_and_gl(const String &p_display_d
#endif
return _test_create_rendering_device(p_display_driver);
}
#endif
OS_LinuxBSD::OS_LinuxBSD() {
main_loop = nullptr;

View file

@ -137,8 +137,10 @@ public:
virtual String get_system_ca_certificates() override;
#ifdef TOOLS_ENABLED
virtual bool _test_create_rendering_device_and_gl(const String &p_display_driver) const override;
virtual bool _test_create_rendering_device(const String &p_display_driver) const override;
#endif
OS_LinuxBSD();
~OS_LinuxBSD();