diff options
| author | George Marques <george@gmarqu.es> | 2018-11-01 10:27:04 -0300 |
|---|---|---|
| committer | George Marques <george@gmarqu.es> | 2018-11-01 10:27:04 -0300 |
| commit | 4c9d734a756628ebc1dbf7b19ca335146c0e6393 (patch) | |
| tree | add0d7f96c12a331658b88b933abe470e17e1315 /platform/haiku | |
| parent | aec8ea4f47af23e6acff181189bbbfaf7f3d18f5 (diff) | |
Fix initialization of visual server in all platforms
Avoid leaking an extra instance when using threads. Also fix threaded
loading issues on Android and iOS.
Diffstat (limited to 'platform/haiku')
| -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; |