Skip to content

Commit 8203808

Browse files
committed
Exclude RD creation test functions from templates
1 parent 53bee4e commit 8203808

File tree

5 files changed

+10
-0
lines changed

5 files changed

+10
-0
lines changed

core/os/os.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,9 +365,11 @@ class OS {
365365
// This is invoked by the GDExtensionManager after loading GDExtensions specified by the project.
366366
virtual void load_platform_gdextensions() const {}
367367

368+
#ifdef TOOLS_ENABLED
368369
// Tests OpenGL context and Rendering Device simultaneous creation. This function is expected to crash on some NVIDIA drivers.
369370
virtual bool _test_create_rendering_device_and_gl(const String &p_display_driver) const { return true; }
370371
virtual bool _test_create_rendering_device(const String &p_display_driver) const { return true; }
372+
#endif
371373

372374
OS();
373375
virtual ~OS();

platform/linuxbsd/os_linuxbsd.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1197,6 +1197,7 @@ String OS_LinuxBSD::get_system_ca_certificates() {
11971197
return f->get_as_text();
11981198
}
11991199

1200+
#ifdef TOOLS_ENABLED
12001201
bool OS_LinuxBSD::_test_create_rendering_device(const String &p_display_driver) const {
12011202
// Tests Rendering Device creation.
12021203

@@ -1263,6 +1264,7 @@ bool OS_LinuxBSD::_test_create_rendering_device_and_gl(const String &p_display_d
12631264
#endif
12641265
return _test_create_rendering_device(p_display_driver);
12651266
}
1267+
#endif
12661268

12671269
OS_LinuxBSD::OS_LinuxBSD() {
12681270
main_loop = nullptr;

platform/linuxbsd/os_linuxbsd.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,10 @@ class OS_LinuxBSD : public OS_Unix {
137137

138138
virtual String get_system_ca_certificates() override;
139139

140+
#ifdef TOOLS_ENABLED
140141
virtual bool _test_create_rendering_device_and_gl(const String &p_display_driver) const override;
141142
virtual bool _test_create_rendering_device(const String &p_display_driver) const override;
143+
#endif
142144

143145
OS_LinuxBSD();
144146
~OS_LinuxBSD();

platform/windows/os_windows.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2570,6 +2570,7 @@ void OS_Windows::add_frame_delay(bool p_can_draw) {
25702570
}
25712571
}
25722572

2573+
#ifdef TOOLS_ENABLED
25732574
bool OS_Windows::_test_create_rendering_device(const String &p_display_driver) const {
25742575
// Tests Rendering Device creation.
25752576

@@ -2662,6 +2663,7 @@ bool OS_Windows::_test_create_rendering_device_and_gl(const String &p_display_dr
26622663
UnregisterClassW(L"Engine probe window", GetModuleHandle(nullptr));
26632664
return ok;
26642665
}
2666+
#endif
26652667

26662668
OS_Windows::OS_Windows(HINSTANCE _hInstance) {
26672669
hInstance = _hInstance;

platform/windows/os_windows.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,10 @@ class OS_Windows : public OS {
257257

258258
void set_main_window(HWND p_main_window) { main_window = p_main_window; }
259259

260+
#ifdef TOOLS_ENABLED
260261
virtual bool _test_create_rendering_device_and_gl(const String &p_display_driver) const override;
261262
virtual bool _test_create_rendering_device(const String &p_display_driver) const override;
263+
#endif
262264

263265
HINSTANCE get_hinstance() { return hInstance; }
264266
OS_Windows(HINSTANCE _hInstance);

0 commit comments

Comments
 (0)