Merge "Trace use scope macro instead of begin-end" into devel/master

[platform/core/uifw/dali-adaptor.git] / dali / internal / system / common / thread-controller.cpp

diff --git a/dali/internal/system/common/thread-controller.cpp b/dali/internal/system/common/thread-controller.cpp
index a9054ec..b3874d2 100644 (file)
--- a/dali/internal/system/common/thread-controller.cpp
+++ b/dali/internal/system/common/thread-controller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,27 +19,24 @@
 #include <dali/internal/system/common/thread-controller.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/system/common/environment-options.h>
-#include <dali/internal/adaptor/common/thread-controller-interface.h>
 #include <dali/internal/adaptor/common/combined-update-render-controller.h>
+#include <dali/internal/adaptor/common/thread-controller-interface.h>
+#include <dali/internal/system/common/environment-options.h>
 
 namespace Dali
 {
-
 namespace Internal
 {
-
 namespace Adaptor
 {
-
-ThreadController::ThreadController( AdaptorInternalServices& adaptorInterfaces, const EnvironmentOptions& environmentOptions )
-: mThreadControllerInterface( NULL )
+ThreadController::ThreadController(AdaptorInternalServices& adaptorInterfaces, const EnvironmentOptions& environmentOptions, ThreadMode threadMode)
+: mThreadControllerInterface(NULL)
 {
-  switch( environmentOptions.GetThreadingMode() )
+  switch(environmentOptions.GetThreadingMode())
   {
     case ThreadingMode::COMBINED_UPDATE_RENDER:
     {
-      mThreadControllerInterface = new CombinedUpdateRenderController( adaptorInterfaces, environmentOptions );
+      mThreadControllerInterface = new CombinedUpdateRenderController(adaptorInterfaces, environmentOptions, threadMode);
       break;
     }
   }
@@ -80,19 +77,19 @@ void ThreadController::RequestUpdate()
   mThreadControllerInterface->RequestUpdate();
 }
 
-void ThreadController::RequestUpdateOnce(   UpdateMode updateMode )
+void ThreadController::RequestUpdateOnce(UpdateMode updateMode)
 {
-  mThreadControllerInterface->RequestUpdateOnce( updateMode );
+  mThreadControllerInterface->RequestUpdateOnce(updateMode);
 }
 
-void ThreadController::ReplaceSurface( Dali::RenderSurfaceInterface* newSurface )
+void ThreadController::ReplaceSurface(Dali::RenderSurfaceInterface* newSurface)
 {
-  mThreadControllerInterface->ReplaceSurface( newSurface );
+  mThreadControllerInterface->ReplaceSurface(newSurface);
 }
 
-void ThreadController::DeleteSurface( Dali::RenderSurfaceInterface* surface )
+void ThreadController::DeleteSurface(Dali::RenderSurfaceInterface* surface)
 {
-  mThreadControllerInterface->DeleteSurface( surface );
+  mThreadControllerInterface->DeleteSurface(surface);
 }
 
 void ThreadController::ResizeSurface()
@@ -105,19 +102,24 @@ void ThreadController::WaitForGraphicsInitialization()
   mThreadControllerInterface->WaitForGraphicsInitialization();
 }
 
-void ThreadController::SetRenderRefreshRate(unsigned int numberOfVSyncsPerRender )
+void ThreadController::SetRenderRefreshRate(unsigned int numberOfVSyncsPerRender)
+{
+  mThreadControllerInterface->SetRenderRefreshRate(numberOfVSyncsPerRender);
+}
+
+void ThreadController::SetPreRenderCallback(CallbackBase* callback)
 {
-  mThreadControllerInterface->SetRenderRefreshRate( numberOfVSyncsPerRender );
+  mThreadControllerInterface->SetPreRenderCallback(callback);
 }
 
-void ThreadController::SetPreRenderCallback( CallbackBase* callback )
+void ThreadController::AddSurface(Dali::RenderSurfaceInterface* newSurface)
 {
-  mThreadControllerInterface->SetPreRenderCallback( callback );
+  mThreadControllerInterface->AddSurface(newSurface);
 }
 
-void ThreadController::AddSurface( Dali::RenderSurfaceInterface* newSurface )
+int32_t ThreadController::GetThreadId() const
 {
-  mThreadControllerInterface->AddSurface( newSurface );
+  return mThreadControllerInterface->GetThreadId();
 }
 
 } // namespace Adaptor