[3.0] Fix for FrameBufferImage.
[platform/core/uifw/dali-core.git] / dali / internal / event / render-tasks / render-task-impl.cpp
index 7304bfc..f80167d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
 // CLASS HEADER
 #include <dali/internal/event/render-tasks/render-task-impl.h>
 
+// EXTERNAL INCLUDES
+#include <cstring> // for strcmp
+
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
-#include <dali/internal/common/event-to-update.h>
+#include <dali/public-api/object/type-registry.h>
+#include <dali/internal/event/common/event-thread-services.h>
 #include <dali/internal/event/actors/actor-impl.h>
 #include <dali/internal/event/actors/camera-actor-impl.h>
+#include <dali/internal/event/common/property-helper.h>
 #include <dali/internal/event/common/stage-impl.h>
-#include <dali/internal/event/common/thread-local-storage.h>
+#include <dali/internal/event/common/projection.h>
 #include <dali/internal/event/images/frame-buffer-image-impl.h>
-#include <dali/internal/update/render-tasks/scene-graph-render-task.h>
 #include <dali/internal/update/nodes/node.h>
+#include <dali/internal/event/render-tasks/render-task-list-impl.h>
+#include <dali/internal/update/render-tasks/scene-graph-render-task.h>
 
 #if defined(DEBUG_ENABLED)
 namespace
@@ -39,42 +45,46 @@ Debug::Filter* gLogRender = Debug::Filter::New(Debug::Concise, false, "LOG_RENDE
 namespace Dali
 {
 
-const Property::Index RenderTask::VIEWPORT_POSITION         = 0;
-const Property::Index RenderTask::VIEWPORT_SIZE             = 1;
-const Property::Index RenderTask::CLEAR_COLOR               = 2;
-
 namespace Internal
 {
 
 namespace // For internal properties
 {
 
-const char* DEFAULT_PROPERTY_NAMES[] =
-{
-  "viewport-position",
-  "viewport-size",
-  "clear-color"
-};
-const int DEFAULT_PROPERTY_COUNT = sizeof( DEFAULT_PROPERTY_NAMES ) / sizeof( DEFAULT_PROPERTY_NAMES[0]);
+// Properties
 
-const Property::Type DEFAULT_PROPERTY_TYPES[DEFAULT_PROPERTY_COUNT] =
-{
-  Property::VECTOR2,    // viewport-position
-  Property::VECTOR2,    // viewport-size
-  Property::VECTOR4,    // clear-color
-};
+//              Name                 Type     writable animatable constraint-input  enum for index-checking
+DALI_PROPERTY_TABLE_BEGIN
+DALI_PROPERTY( "viewportPosition",   VECTOR2,    true,    true,    true,    Dali::RenderTask::Property::VIEWPORT_POSITION )
+DALI_PROPERTY( "viewportSize",       VECTOR2,    true,    true,    true,    Dali::RenderTask::Property::VIEWPORT_SIZE     )
+DALI_PROPERTY( "clearColor",         VECTOR4,    true,    true,    true,    Dali::RenderTask::Property::CLEAR_COLOR       )
+DALI_PROPERTY( "requiresSync",       BOOLEAN,    true,    false,   false,   Dali::RenderTask::Property::REQUIRES_SYNC     )
+DALI_PROPERTY_TABLE_END( DEFAULT_OBJECT_PROPERTY_START_INDEX )
 
-}// unnamed namespace
+// Signals
+
+const char* const SIGNAL_FINISHED = "finished";
+
+TypeRegistration mType( typeid( Dali::RenderTask ), typeid( Dali::BaseHandle ), NULL );
+
+SignalConnectorType signalConnector1( mType, SIGNAL_FINISHED, &RenderTask::DoConnectSignal );
+
+} // Unnamed namespace
 
 RenderTask* RenderTask::New( bool isSystemLevel )
 {
-  RenderTask* task( new RenderTask( ThreadLocalStorage::Get().GetEventToUpdate(), isSystemLevel ) );
+  RenderTask* task( new RenderTask( isSystemLevel ) );
 
   return task;
 }
 
 void RenderTask::SetSourceActor( Actor* actor )
 {
+  const Stage* stage = Stage::GetCurrent();
+  if ( stage )
+  {
+    stage->GetRenderTaskList().SetExclusive( this, mExclusive );
+  }
   mSourceConnector.SetActor( actor );
 }
 
@@ -89,10 +99,16 @@ void RenderTask::SetExclusive( bool exclusive )
   {
     mExclusive = exclusive;
 
+    const Stage* stage = Stage::GetCurrent();
+    if ( stage )
+    {
+      stage->GetRenderTaskList().SetExclusive( this, exclusive );
+    }
+
     if ( mSceneObject )
     {
       // mSceneObject is being used in a separate thread; queue a message to set the value
-      SetExclusiveMessage( mEventToUpdate, *mSceneObject, mExclusive );
+      SetExclusiveMessage( GetEventThreadServices(), *mSceneObject, mExclusive );
     }
   }
 }
@@ -114,6 +130,14 @@ bool RenderTask::GetInputEnabled() const
 
 void RenderTask::SetCameraActor( CameraActor* cameraActor )
 {
+  if( cameraActor )
+  {
+    mCameraConnector.mCamera = cameraActor->GetCamera();
+  }
+  else
+  {
+    mCameraConnector.mCamera = NULL;
+  }
   mCameraConnector.SetActor( cameraActor );
 }
 
@@ -139,15 +163,17 @@ void RenderTask::SetTargetFrameBuffer( Dali::FrameBufferImage image )
       mFrameBufferImage = image;
 
       unsigned int resourceId = 0;
-      if(mFrameBufferImage)
+      bool isNativeFBO = false;
+      if( mFrameBufferImage )
       {
-        GetImplementation(mFrameBufferImage).Connect();
-
-        resourceId = GetImplementation( mFrameBufferImage ).GetResourceId();
+        Dali::Internal::FrameBufferImage& impl = GetImplementation( mFrameBufferImage );
+        impl.Connect();
+        resourceId = impl.GetResourceId();
+        isNativeFBO = impl.IsNativeFbo();
       }
 
       // mSceneObject is being used in a separate thread; queue a message to set the value
-      SetFrameBufferIdMessage( mEventToUpdate, *mSceneObject, resourceId );
+      SetFrameBufferIdMessage( GetEventThreadServices(), *mSceneObject, resourceId, isNativeFBO );
     }
     else
     {
@@ -157,6 +183,25 @@ void RenderTask::SetTargetFrameBuffer( Dali::FrameBufferImage image )
   }
 }
 
+void RenderTask::SetFrameBuffer( Dali::FrameBuffer frameBuffer )
+{
+  if( frameBuffer )
+  {
+    mFrameBuffer = Internal::FrameBufferPtr( &GetImplementation( frameBuffer ) );
+    SetFrameBufferMessage( GetEventThreadServices(), *mSceneObject, mFrameBuffer->GetRenderObject() );
+  }
+  else
+  {
+    mFrameBuffer.Reset();
+    SetFrameBufferMessage( GetEventThreadServices(), *mSceneObject, NULL );
+  }
+}
+
+FrameBuffer* RenderTask::GetFrameBuffer() const
+{
+  return mFrameBuffer.Get();
+}
+
 Dali::FrameBufferImage RenderTask::GetTargetFrameBuffer() const
 {
   return mFrameBufferImage;
@@ -184,26 +229,22 @@ Actor* RenderTask::GetScreenToFrameBufferMappingActor() const
 
 void RenderTask::SetViewportPosition(const Vector2& value)
 {
-  StagePtr stage = Stage::GetCurrent();
-  BakeViewportPositionMessage( stage->GetUpdateInterface(), *mSceneObject, value );
+  BakeViewportPositionMessage( GetEventThreadServices(), *mSceneObject, value );
 }
 
 Vector2 RenderTask::GetCurrentViewportPosition() const
 {
-  StagePtr stage = Stage::GetCurrent();
-  return mSceneObject->GetViewportPosition(stage->GetEventBufferIndex());
+  return mSceneObject->GetViewportPosition( GetEventThreadServices().GetEventBufferIndex() );
 }
 
 void RenderTask::SetViewportSize(const Vector2& value)
 {
-  StagePtr stage = Stage::GetCurrent();
-  BakeViewportSizeMessage( stage->GetUpdateInterface(), *mSceneObject, value );
+  BakeViewportSizeMessage( GetEventThreadServices(), *mSceneObject, value );
 }
 
 Vector2 RenderTask::GetCurrentViewportSize() const
 {
-  StagePtr stage = Stage::GetCurrent();
-  return mSceneObject->GetViewportSize(stage->GetEventBufferIndex());
+  return mSceneObject->GetViewportSize( GetEventThreadServices().GetEventBufferIndex() );
 }
 
 void RenderTask::SetViewport( const Viewport& viewport )
@@ -214,7 +255,7 @@ void RenderTask::SetViewport( const Viewport& viewport )
 
 void RenderTask::GetViewport( Viewport& viewPort ) const
 {
-  BufferIndex bufferIndex = Stage::GetCurrent()->GetEventBufferIndex();
+  BufferIndex bufferIndex = GetEventThreadServices().GetEventBufferIndex();
 
   if(!mSceneObject->GetViewportEnabled( bufferIndex ))
   {
@@ -226,10 +267,14 @@ void RenderTask::GetViewport( Viewport& viewPort ) const
     }
     else
     {
-      Vector2 size( Stage::GetCurrent()->GetSize() );
-      viewPort.x = viewPort.y = 0;
-      viewPort.width = size.width;
-      viewPort.height = size.height;
+      Internal::Stage* stage = Internal::Stage::GetCurrent();
+      if ( stage )
+      {
+        Vector2 size( stage->GetSize() );
+        viewPort.x = viewPort.y = 0;
+        viewPort.width = size.width;
+        viewPort.height = size.height;
+      }
     }
   }
   else
@@ -252,16 +297,33 @@ void RenderTask::SetClearColor( const Vector4& color )
     if ( mSceneObject )
     {
       // mSceneObject is being used in a separate thread; queue a message to set the value
-      StagePtr stage = Stage::GetCurrent();
-      BakeClearColorMessage( stage->GetUpdateInterface(), *mSceneObject, color );
+      BakeClearColorMessage( GetEventThreadServices(), *mSceneObject, color );
     }
   }
 }
 
 const Vector4& RenderTask::GetClearColor() const
 {
-  StagePtr stage = Stage::GetCurrent();
-  return mSceneObject->GetClearColor(stage->GetEventBufferIndex());
+  return mSceneObject->GetClearColor( GetEventThreadServices().GetEventBufferIndex() );
+}
+
+void RenderTask::SetSyncRequired( bool requiresSync )
+{
+  if( mRequiresSync != requiresSync )
+  {
+    mRequiresSync = requiresSync;
+
+    if( mSceneObject )
+    {
+      // mSceneObject is being used in a separate thread; queue a message to set the value
+      SetSyncRequiredMessage( GetEventThreadServices(), *mSceneObject, requiresSync );
+    }
+  }
+}
+
+bool RenderTask::IsSyncRequired() const
+{
+  return mRequiresSync;
 }
 
 void RenderTask::SetClearEnabled( bool enabled )
@@ -273,7 +335,7 @@ void RenderTask::SetClearEnabled( bool enabled )
     if ( mSceneObject )
     {
       // mSceneObject is being used in a separate thread; queue a message to set the value
-      SetClearEnabledMessage( mEventToUpdate, *mSceneObject, mClearEnabled );
+      SetClearEnabledMessage( GetEventThreadServices(), *mSceneObject, mClearEnabled );
     }
   }
 }
@@ -292,7 +354,7 @@ void RenderTask::SetCullMode( bool mode )
     if ( mSceneObject )
     {
       // mSceneObject is being used in a separate thread; queue a message to set the value
-      SetCullModeMessage( mEventToUpdate, *mSceneObject, mCullMode );
+      SetCullModeMessage( GetEventThreadServices(), *mSceneObject, mCullMode );
     }
   }
 }
@@ -314,7 +376,7 @@ void RenderTask::SetRefreshRate( unsigned int refreshRate )
   if ( mSceneObject )
   {
     // mSceneObject is being used in a separate thread; queue a message to set the value
-    SetRefreshRateMessage( mEventToUpdate, *mSceneObject, refreshRate );
+    SetRefreshRateMessage( GetEventThreadServices(), *mSceneObject, refreshRate );
   }
 }
 
@@ -359,32 +421,35 @@ bool RenderTask::TranslateCoordinates( Vector2& screenCoords ) const
   {
     CameraActor* localCamera = GetCameraActor();
     StagePtr stage = Stage::GetCurrent();
-    CameraActor& defaultCamera = stage->GetDefaultCameraActor();
-    if( localCamera )
+    if( stage )
     {
-      Viewport viewport;
-      Vector2 size( stage->GetSize() );
-      viewport.x = viewport.y = 0;
-      viewport.width = size.width;
-      viewport.height = size.height;
-
-      float localX, localY;
-      inside = mMappingConnector.mActor->ScreenToLocal(defaultCamera.GetViewMatrix(), defaultCamera.GetProjectionMatrix(), viewport, localX, localY, screenCoords.x, screenCoords.y);
-      Vector3 actorSize = mMappingConnector.mActor->GetCurrentSize();
-      if( inside && localX >= 0.f && localX <= actorSize.x && localY >= 0.f && localY <= actorSize.y)
+      CameraActor& defaultCamera = stage->GetDefaultCameraActor();
+      if( localCamera )
       {
-        screenCoords.x = localX;
-        screenCoords.y = localY;
+        Viewport viewport;
+        Vector2 size( stage->GetSize() );
+        viewport.x = viewport.y = 0;
+        viewport.width = size.width;
+        viewport.height = size.height;
+
+        float localX, localY;
+        inside = mMappingConnector.mActor->ScreenToLocal(defaultCamera.GetViewMatrix(), defaultCamera.GetProjectionMatrix(), viewport, localX, localY, screenCoords.x, screenCoords.y);
+        Vector3 actorSize = mMappingConnector.mActor->GetCurrentSize();
+        if( inside && localX >= 0.f && localX <= actorSize.x && localY >= 0.f && localY <= actorSize.y)
+        {
+          screenCoords.x = localX;
+          screenCoords.y = localY;
+        }
+        else
+        {
+          inside = false;
+        }
       }
       else
       {
         inside = false;
       }
     }
-    else
-    {
-      inside = false;
-    }
   }
   else if ( mFrameBufferImage && mScreenToFrameBufferFunction )
   {
@@ -398,6 +463,40 @@ bool RenderTask::IsSystemLevel() const
   return mIsSystemLevel;
 }
 
+bool RenderTask::WorldToViewport(const Vector3 &position, float& viewportX, float& viewportY) const
+{
+  CameraActor* cam = GetCameraActor();
+
+  Vector4 pos(position);
+  pos.w = 1.f;
+
+  Vector4 viewportPosition;
+
+  Viewport viewport;
+  GetViewport( viewport );
+
+  bool ok = ProjectFull(pos,
+                        cam->GetViewMatrix(),
+                        cam->GetProjectionMatrix(),
+                        viewport.x,
+                        viewport.y,
+                        viewport.width,
+                        viewport.height,
+                        viewportPosition);
+  if(ok)
+  {
+    viewportX = viewportPosition.x;
+    viewportY = viewportPosition.y;
+  }
+
+  return ok;
+}
+
+bool RenderTask::ViewportToLocal(Actor* actor, float viewportX, float viewportY, float &localX, float &localY) const
+{
+  return actor->ScreenToLocal( *this, localX, localY, viewportX, viewportY );
+}
+
 SceneGraph::RenderTask* RenderTask::CreateSceneObject()
 {
   // This should only be called once, with no existing scene-object
@@ -408,22 +507,24 @@ SceneGraph::RenderTask* RenderTask::CreateSceneObject()
 
   // if we have a frame buffer we need to track connection status then send a message to set the frame buffer id in case it has changed since last time we were on stage
   unsigned int resourceId = 0;
-  if(mFrameBufferImage)
+  bool isNativeFBO = false;
+  if( mFrameBufferImage )
   {
-    GetImplementation(mFrameBufferImage).Connect();
-
-    resourceId = GetImplementation( mFrameBufferImage ).GetResourceId();
+    Dali::Internal::FrameBufferImage& impl = GetImplementation( mFrameBufferImage );
+    impl.Connect();
+    resourceId = impl.GetResourceId();
+    isNativeFBO = impl.IsNativeFbo();
   }
 
   // mSceneObject is being used in a separate thread; queue a message to set the value
-  SetFrameBufferIdMessage( mEventToUpdate, *mSceneObject, resourceId );
+  SetFrameBufferIdMessage( GetEventThreadServices(), *mSceneObject, resourceId, isNativeFBO );
 
   // Send messages to set other properties that may have changed since last time we were on stage
-  SetExclusiveMessage( mEventToUpdate, *mSceneObject, mExclusive );
-  SetClearColorMessage(  mEventToUpdate, *mSceneObject, mClearColor );
-  SetClearEnabledMessage(  mEventToUpdate, *mSceneObject, mClearEnabled );
-  SetCullModeMessage(  mEventToUpdate, *mSceneObject, mCullMode );
-  SetRefreshRateMessage(  mEventToUpdate, *mSceneObject, mRefreshRate );
+  SetExclusiveMessage( GetEventThreadServices(), *mSceneObject, mExclusive );
+  SetClearColorMessage(  GetEventThreadServices(), *mSceneObject, mClearColor );
+  SetClearEnabledMessage(  GetEventThreadServices(), *mSceneObject, mClearEnabled );
+  SetCullModeMessage(  GetEventThreadServices(), *mSceneObject, mCullMode );
+  SetRefreshRateMessage(  GetEventThreadServices(), *mSceneObject, mRefreshRate );
 
   // Caller takes ownership
   return mSceneObject;
@@ -447,9 +548,7 @@ void RenderTask::DiscardSceneObject()
 }
 
 /********************************************************************************
- ********************************************************************************
  ********************************   PROPERTY METHODS   **************************
- ********************************************************************************
  ********************************************************************************/
 
 unsigned int RenderTask::GetDefaultPropertyCount() const
@@ -459,11 +558,11 @@ unsigned int RenderTask::GetDefaultPropertyCount() const
 
 void RenderTask::GetDefaultPropertyIndices( Property::IndexContainer& indices ) const
 {
-  indices.reserve( DEFAULT_PROPERTY_COUNT );
+  indices.Reserve( DEFAULT_PROPERTY_COUNT );
 
   for ( int i = 0; i < DEFAULT_PROPERTY_COUNT; ++i )
   {
-    indices.push_back( i );
+    indices.PushBack( i );
   }
 }
 
@@ -471,7 +570,7 @@ const char* RenderTask::GetDefaultPropertyName( Property::Index index ) const
 {
   if( index < DEFAULT_PROPERTY_COUNT )
   {
-    return DEFAULT_PROPERTY_NAMES[index];
+    return DEFAULT_PROPERTY_DETAILS[index].name;
   }
   else
   {
@@ -486,7 +585,7 @@ Property::Index RenderTask::GetDefaultPropertyIndex(const std::string& name) con
   // Look for name in default properties
   for( int i = 0; i < DEFAULT_PROPERTY_COUNT; ++i )
   {
-    if( 0 == strcmp( name.c_str(), DEFAULT_PROPERTY_NAMES[ i ] ) ) // dont want to convert rhs to string
+    if( 0 == strcmp( name.c_str(), DEFAULT_PROPERTY_DETAILS[i].name ) ) // dont want to convert rhs to string
     {
       index = i;
       break;
@@ -498,51 +597,54 @@ Property::Index RenderTask::GetDefaultPropertyIndex(const std::string& name) con
 
 bool RenderTask::IsDefaultPropertyWritable(Property::Index index) const
 {
-  return true; // all properties writable
+  return DEFAULT_PROPERTY_DETAILS[ index ].writable;
 }
 
 bool RenderTask::IsDefaultPropertyAnimatable(Property::Index index) const
 {
-  return true; // all properties animatable
+  return DEFAULT_PROPERTY_DETAILS[ index ].animatable;
 }
 
 bool RenderTask::IsDefaultPropertyAConstraintInput( Property::Index index ) const
 {
-  return true; // all properties can be used as constraint input
+  return DEFAULT_PROPERTY_DETAILS[ index ].constraintInput;
 }
 
 Property::Type RenderTask::GetDefaultPropertyType(Property::Index index) const
 {
   if( index < DEFAULT_PROPERTY_COUNT )
   {
-    return DEFAULT_PROPERTY_TYPES[index];
-  }
-  else
-  {
-    // index out of range...return Property::NONE
-    return Property::NONE;
+    return DEFAULT_PROPERTY_DETAILS[index].type;
   }
+
+  // index out of range...return Property::NONE
+  return Property::NONE;
 }
 
 void RenderTask::SetDefaultProperty( Property::Index index, const Property::Value& property )
 {
   switch ( index )
   {
-    case Dali::RenderTask::VIEWPORT_POSITION:
+    case Dali::RenderTask::Property::VIEWPORT_POSITION:
     {
       SetViewportPosition( property.Get<Vector2>() );
       break;
     }
-    case Dali::RenderTask::VIEWPORT_SIZE:
+    case Dali::RenderTask::Property::VIEWPORT_SIZE:
     {
       SetViewportSize( property.Get<Vector2>() );
       break;
     }
-    case Dali::RenderTask::CLEAR_COLOR:
+    case Dali::RenderTask::Property::CLEAR_COLOR:
     {
       SetClearColor( property.Get<Vector4>() );
       break;
     }
+    case Dali::RenderTask::Property::REQUIRES_SYNC:
+    {
+      SetSyncRequired( property.Get<bool>() );
+      break;
+    }
     default:
     {
       // nothing to do
@@ -558,21 +660,26 @@ Property::Value RenderTask::GetDefaultProperty(Property::Index index) const
   switch ( index )
   {
 
-    case Dali::RenderTask::VIEWPORT_POSITION:
+    case Dali::RenderTask::Property::VIEWPORT_POSITION:
     {
       value = GetCurrentViewportPosition();
       break;
     }
-    case Dali::RenderTask::VIEWPORT_SIZE:
+    case Dali::RenderTask::Property::VIEWPORT_SIZE:
     {
       value = GetCurrentViewportSize();
       break;
     }
-    case Dali::RenderTask::CLEAR_COLOR:
+    case Dali::RenderTask::Property::CLEAR_COLOR:
     {
       value = GetClearColor();
       break;
     }
+    case Dali::RenderTask::Property::REQUIRES_SYNC:
+    {
+      value = IsSyncRequired();
+      break;
+    }
 
     default:
     {
@@ -600,15 +707,15 @@ const SceneGraph::PropertyBase* RenderTask::GetSceneObjectAnimatableProperty( Pr
   {
     switch ( index )
     {
-      case Dali::RenderTask::VIEWPORT_POSITION:
+      case Dali::RenderTask::Property::VIEWPORT_POSITION:
         property = &mSceneObject->mViewportPosition;
         break;
 
-      case Dali::RenderTask::VIEWPORT_SIZE:
+      case Dali::RenderTask::Property::VIEWPORT_SIZE:
         property = &mSceneObject->mViewportSize;
         break;
 
-      case Dali::RenderTask::CLEAR_COLOR:
+      case Dali::RenderTask::Property::CLEAR_COLOR:
         property = &mSceneObject->mClearColor;
         break;
 
@@ -627,16 +734,16 @@ const PropertyInputImpl* RenderTask::GetSceneObjectInputProperty( Property::Inde
   {
     switch ( index )
     {
-      case Dali::RenderTask::VIEWPORT_POSITION:
+      case Dali::RenderTask::Property::VIEWPORT_POSITION:
         property = &mSceneObject->mViewportPosition;
         break;
 
-      case Dali::RenderTask::VIEWPORT_SIZE:
+      case Dali::RenderTask::Property::VIEWPORT_SIZE:
         property = &mSceneObject->mViewportSize;
         break;
 
-      case Dali::RenderTask::CLEAR_COLOR:
-        property = &mSceneObject->mViewportSize;
+      case Dali::RenderTask::Property::CLEAR_COLOR:
+        property = &mSceneObject->mClearColor;
         break;
 
       default:
@@ -684,7 +791,7 @@ bool RenderTask::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface
   bool connected( true );
   RenderTask* renderTask = dynamic_cast<RenderTask*>(object);
 
-  if ( Dali::RenderTask::SIGNAL_FINISHED == signalName )
+  if ( 0 == strcmp( signalName.c_str(), SIGNAL_FINISHED ) )
   {
     renderTask->FinishedSignal().Connect( tracker, functor );
   }
@@ -697,9 +804,8 @@ bool RenderTask::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface
   return connected;
 }
 
-RenderTask::RenderTask( EventToUpdate& eventToUpdate, bool isSystemLevel )
-: mEventToUpdate( eventToUpdate ),
-  mSceneObject( NULL ),
+RenderTask::RenderTask( bool isSystemLevel )
+: mSceneObject( NULL ),
   mSourceConnector( Connector::SOURCE_CONNECTOR, *this ),
   mCameraConnector( Connector::CAMERA_CONNECTOR, *this ),
   mMappingConnector( Connector::MAPPING_CONNECTOR, *this  ),
@@ -711,7 +817,8 @@ RenderTask::RenderTask( EventToUpdate& eventToUpdate, bool isSystemLevel )
   mInputEnabled( Dali::RenderTask::DEFAULT_INPUT_ENABLED ),
   mClearEnabled( Dali::RenderTask::DEFAULT_CLEAR_ENABLED ),
   mCullMode( Dali::RenderTask::DEFAULT_CULL_MODE ),
-  mIsSystemLevel( isSystemLevel )
+  mIsSystemLevel( isSystemLevel ),
+  mRequiresSync( false )
 {
   DALI_LOG_INFO(gLogRender, Debug::General, "RenderTask::RenderTask(this:%p)\n", this);
 }
@@ -726,7 +833,8 @@ RenderTask::~RenderTask()
 RenderTask::Connector::Connector( Type type, RenderTask& renderTask )
 : mType( type ),
   mRenderTask( renderTask ),
-  mActor( NULL )
+  mActor( NULL ),
+  mCamera( NULL )
 {
 }
 
@@ -755,19 +863,29 @@ void RenderTask::Connector::SetActor( Actor* actor )
   }
 }
 
-void RenderTask::Connector::SceneObjectAdded( ProxyObject& proxy )
+void RenderTask::Connector::SceneObjectAdded( Object& object )
 {
   UpdateRenderTask();
 }
 
-void RenderTask::Connector::SceneObjectRemoved( ProxyObject& proxy )
+void RenderTask::Connector::SceneObjectRemoved( Object& object )
 {
   UpdateRenderTask();
 }
 
-void RenderTask::Connector::ProxyDestroyed( ProxyObject& proxy )
+void RenderTask::Connector::ObjectDestroyed( Object& object )
 {
+  if ( SOURCE_CONNECTOR == mType )
+  {
+    const Stage* stage = Stage::GetCurrent();
+    if ( stage )
+    {
+      stage->GetRenderTaskList().SetExclusive( &mRenderTask, false );
+    }
+  }
+
   mActor = NULL;
+  mCamera = NULL; // only meaningful for the camera connector but no simple way to distinguish
 
   UpdateRenderTask();
 }
@@ -794,11 +912,11 @@ void RenderTask::Connector::UpdateRenderTask()
     //the mapping node is not used in the scene graph
     if ( SOURCE_CONNECTOR == mType )
     {
-      SetSourceNodeMessage( mRenderTask.mEventToUpdate, *(mRenderTask.mSceneObject), node );
+      SetSourceNodeMessage( mRenderTask.GetEventThreadServices(), *(mRenderTask.mSceneObject), node );
     }
     else if( CAMERA_CONNECTOR == mType )
     {
-      SetCameraNodeMessage( mRenderTask.mEventToUpdate, *(mRenderTask.mSceneObject), node );
+      SetCameraMessage( mRenderTask.GetEventThreadServices(), *(mRenderTask.mSceneObject), node, mCamera );
     }
   }
 }