Fixed samplers using images with a load policy of ON_DEMAND

Images that have an ON_DEMAND policy, such as ResourceImage and Atlas
delay getting their resource ticket until they are staged. Sampler
should not attempt to read the resource Id until the image has been
connected.

Change-Id: I20772d1505eb92256e937363f14c70ac73d238ab
Signed-off-by: David Steele <david.steele@partner.samsung.com>

diff --git a/dali/internal/event/effects/sampler-impl.cpp b/dali/internal/event/effects/sampler-impl.cpp
index 078bd21..0a39c30 100644 (file)
--- a/dali/internal/event/effects/sampler-impl.cpp
+++ b/dali/internal/event/effects/sampler-impl.cpp
@@ -66,8 +66,14 @@ void Sampler::SetImage( ImagePtr& image )
   mImageConnector.Set( image, OnStage() );
 
   // sceneObject is being used in a separate thread; queue a message to set
-  unsigned int resourceId = image->GetResourceId();
-  SetTextureMessage( GetEventThreadServices(), *mSceneObject, resourceId );
+  if( mOnStage )
+  {
+    unsigned int resourceId = image->GetResourceId();
+    if( resourceId != 0 )
+    {
+      SetTextureMessage( GetEventThreadServices(), *mSceneObject, resourceId );
+    }
+  }
 }
 
 void Sampler::SetFilterMode( Dali::Sampler::FilterMode minFilter, Dali::Sampler::FilterMode magFilter )
@@ -313,6 +319,10 @@ void Sampler::Connect()
   mOnStage = true;
 
   mImageConnector.OnStageConnect();
+
+  // sceneObject is being used in a separate thread; queue a message to set
+  unsigned int resourceId = mImageConnector.Get()->GetResourceId();
+  SetTextureMessage( GetEventThreadServices(), *mSceneObject, resourceId );
 }
 
 void Sampler::Disconnect()

diff --git a/dali/internal/event/images/image-connector.cpp b/dali/internal/event/images/image-connector.cpp
index 20ffdef..265115c 100644 (file)
--- a/dali/internal/event/images/image-connector.cpp
+++ b/dali/internal/event/images/image-connector.cpp
@@ -28,6 +28,7 @@ namespace Internal
 {
 
 ImageConnector::ImageConnector()
+: mImage(NULL)
 {
 }