From 612ab8fcdb94bf0cd9d7b4a3006b4e4f76c9a13b Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Fri, 9 Jun 2017 00:23:50 -0300 Subject: -Restored multithread capability to VisualServer -Restored resource previews! --- platform/x11/os_x11.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'platform') diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 8ac37c965b..2eebc96d2c 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -34,6 +34,7 @@ #include "print_string.h" #include "servers/physics/physics_server_sw.h" #include "servers/visual/visual_server_raster.h" +#include "servers/visual/visual_server_wrap_mt.h" #include #include #include @@ -206,12 +207,12 @@ void OS_X11::initialize(const VideoMode &p_desired, int p_video_driver, int p_au #endif visual_server = memnew(VisualServerRaster); -#if 0 - if (get_render_thread_mode()!=RENDER_THREAD_UNSAFE) { - visual_server =memnew(VisualServerWrapMT(visual_server,get_render_thread_mode()==RENDER_SEPARATE_THREAD)); + if (get_render_thread_mode() != RENDER_THREAD_UNSAFE) { + + visual_server = memnew(VisualServerWrapMT(visual_server, get_render_thread_mode() == RENDER_SEPARATE_THREAD)); } -#endif + // borderless fullscreen window mode if (current_videomode.fullscreen) { // needed for lxde/openbox, possibly others -- cgit v1.2.3