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/iphone | |
| 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/iphone')
| -rw-r--r-- | platform/iphone/os_iphone.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/platform/iphone/os_iphone.cpp b/platform/iphone/os_iphone.cpp index addef61ec7..d0934d8e9d 100644 --- a/platform/iphone/os_iphone.cpp +++ b/platform/iphone/os_iphone.cpp @@ -34,7 +34,7 @@ #include "drivers/gles3/rasterizer_gles3.h" #include "servers/visual/visual_server_raster.h" -//#include "servers/visual/visual_server_wrap_mt.h" +#include "servers/visual/visual_server_wrap_mt.h" #include "main/main.h" @@ -107,13 +107,12 @@ Error OSIPhone::initialize(const VideoMode &p_desired, int p_video_driver, int p RasterizerGLES3::register_config(); RasterizerGLES3::make_current(); - visual_server = memnew(VisualServerRaster()); - /* - FIXME: Reimplement threaded rendering? Or remove? + // FIXME: Reimplement threaded rendering? Or remove? 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); |