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/android | |
| 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/android')
| -rw-r--r-- | platform/android/os_android.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp index 8e050c1d27..abbd9c9aa7 100644 --- a/platform/android/os_android.cpp +++ b/platform/android/os_android.cpp @@ -39,7 +39,7 @@ #include "file_access_android.h" #include "main/main.h" #include "servers/visual/visual_server_raster.h" -//#include "servers/visual/visual_server_wrap_mt.h" +#include "servers/visual/visual_server_wrap_mt.h" #ifdef ANDROID_NATIVE_ACTIVITY #include "dir_access_android.h" @@ -182,11 +182,12 @@ Error OS_Android::initialize(const VideoMode &p_desired, int p_video_driver, int video_driver_index = p_video_driver; - visual_server = memnew(VisualServerRaster); - /* if (get_render_thread_mode() != RENDER_THREAD_UNSAFE) { + if (get_render_thread_mode() != RENDER_THREAD_UNSAFE) { visual_server = memnew(VisualServerWrapMT(visual_server, false)); - };*/ + } else { + visual_server = memnew(VisualServerRaster); + } visual_server->init(); // visual_server->cursor_set_visible(false, 0); |