diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-11-01 16:41:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-01 16:41:01 +0100 |
| commit | 18d06b971b7d04cc4dc93607dd90720f8e6c5624 (patch) | |
| tree | 6c367eb0171cf996d727e3467d66ca381210f7d5 /platform/haiku/os_haiku.cpp | |
| parent | b776049b83960c37d4616364346c510068f2852d (diff) | |
| parent | 4c9d734a756628ebc1dbf7b19ca335146c0e6393 (diff) | |
Merge pull request #23434 from vnen/visual-thread-fix
Fix initialization of visual server in all platforms
Diffstat (limited to 'platform/haiku/os_haiku.cpp')
| -rw-r--r-- | platform/haiku/os_haiku.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/platform/haiku/os_haiku.cpp b/platform/haiku/os_haiku.cpp index c80365f1f3..a4a32c939c 100644 --- a/platform/haiku/os_haiku.cpp +++ b/platform/haiku/os_haiku.cpp @@ -117,16 +117,15 @@ Error OS_Haiku::initialize(const VideoMode &p_desired, int p_video_driver, int p #endif - visual_server = memnew(VisualServerRaster()); - - ERR_FAIL_COND_V(!visual_server, ERR_UNAVAILABLE); - - // TODO: enable multithreaded VS - /* + // FIXME: Reimplement threaded rendering? Or remove? if (get_render_thread_mode() != RENDER_THREAD_UNSAFE) { - visual_server = memnew(VisualServerWrapMT(visual_server, get_render_thread_mode() == RENDER_SEPARATE_THREAD)); + + visual_server = memnew(VisualServerWrapMT(visual_server, false)); + } else { + visual_server = memnew(VisualServerRaster); } - */ + + ERR_FAIL_COND_V(!visual_server, ERR_UNAVAILABLE); video_driver_index = p_video_driver; |