seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Exclude RD creation test functions from templates

Browse Source
This commit is contained in:
Pedro J. Estébanez
2025-05-15 10:12:38 +02:00
parent 53bee4eb56
commit 820380817a
5 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/os/os.h
View File

@ -365,9 +365,11 @@ public:
// This is invoked by the GDExtensionManager after loading GDExtensions specified by the project. // This is invoked by the GDExtensionManager after loading GDExtensions specified by the project.
virtual void load_platform_gdextensions() const {} virtual void load_platform_gdextensions() const {}
#ifdef TOOLS_ENABLED
// Tests OpenGL context and Rendering Device simultaneous creation. This function is expected to crash on some NVIDIA drivers. // Tests OpenGL context and Rendering Device simultaneous creation. This function is expected to crash on some NVIDIA drivers.
virtual bool _test_create_rendering_device_and_gl(const String &p_display_driver) const { return true; } virtual bool _test_create_rendering_device_and_gl(const String &p_display_driver) const { return true; }
virtual bool _test_create_rendering_device(const String &p_display_driver) const { return true; } virtual bool _test_create_rendering_device(const String &p_display_driver) const { return true; }
#endif
OS(); OS();
virtual ~OS(); virtual ~OS();

2
platform/linuxbsd/os_linuxbsd.cpp
View File

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

2
platform/linuxbsd/os_linuxbsd.h
View File

@ -137,8 +137,10 @@ public:
virtual String get_system_ca_certificates() override; 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_and_gl(const String &p_display_driver) const override;
virtual bool _test_create_rendering_device(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();
~OS_LinuxBSD(); ~OS_LinuxBSD();

2
platform/windows/os_windows.cpp
View File

@ -2570,6 +2570,7 @@ void OS_Windows::add_frame_delay(bool p_can_draw) {
} }
} }
#ifdef TOOLS_ENABLED
bool OS_Windows::_test_create_rendering_device(const String &p_display_driver) const { bool OS_Windows::_test_create_rendering_device(const String &p_display_driver) const {
// Tests Rendering Device creation. // Tests Rendering Device creation.
@ -2662,6 +2663,7 @@ bool OS_Windows::_test_create_rendering_device_and_gl(const String &p_display_dr
UnregisterClassW(L"Engine probe window", GetModuleHandle(nullptr)); UnregisterClassW(L"Engine probe window", GetModuleHandle(nullptr));
return ok; return ok;
} }
#endif
OS_Windows::OS_Windows(HINSTANCE _hInstance) { OS_Windows::OS_Windows(HINSTANCE _hInstance) {
hInstance = _hInstance; hInstance = _hInstance;

2
platform/windows/os_windows.h
View File

@ -257,8 +257,10 @@ public:
void set_main_window(HWND p_main_window) { main_window = p_main_window; } void set_main_window(HWND p_main_window) { main_window = p_main_window; }
#ifdef TOOLS_ENABLED
virtual bool _test_create_rendering_device_and_gl(const String &p_display_driver) const override; 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; virtual bool _test_create_rendering_device(const String &p_display_driver) const override;
#endif
HINSTANCE get_hinstance() { return hInstance; } HINSTANCE get_hinstance() { return hInstance; }
OS_Windows(HINSTANCE _hInstance); OS_Windows(HINSTANCE _hInstance);