[dali_1.2.43] Merge branch 'devel/master'

[platform/core/uifw/dali-adaptor.git] / adaptors / base / thread-controller.cpp

diff --git a/adaptors/base/thread-controller.cpp b/adaptors/base/thread-controller.cpp
index 3c8aa5f..ed12064 100644 (file)
--- a/adaptors/base/thread-controller.cpp
+++ b/adaptors/base/thread-controller.cpp
@@ -21,6 +21,7 @@
 // INTERNAL INCLUDES
 #include <base/environment-options.h>
 #include <base/thread-controller-interface.h>
+#include <base/combined-update-render/combined-update-render-controller.h>
 #include <base/separate-update-render/separate-update-render-controller.h>
 #include <base/single-threaded/single-thread-controller.h>
 
@@ -39,12 +40,17 @@ ThreadController::ThreadController( AdaptorInternalServices& adaptorInterfaces,
   switch( environmentOptions.GetThreadingMode() )
   {
     case ThreadingMode::SEPARATE_UPDATE_RENDER:
-    case ThreadingMode::COMBINED_UPDATE_RENDER:
     {
       mThreadControllerInterface = new SeparateUpdateRenderController( adaptorInterfaces, environmentOptions );
       break;
     }
 
+    case ThreadingMode::COMBINED_UPDATE_RENDER:
+    {
+      mThreadControllerInterface = new CombinedUpdateRenderController( adaptorInterfaces, environmentOptions );
+      break;
+    }
+
     case ThreadingMode::SINGLE_THREADED:
     {
       mThreadControllerInterface = new SingleThreadController( adaptorInterfaces, environmentOptions );