[4.0] Fix initialization issue

Sometimes EGL image extensions are initialized after NativeImageSource is created.

Change-Id: Iae3847e20e6f25ca4e27cf0e8fd1f9ca51788f62

diff --git a/adaptors/devel-api/adaptor-framework/native-image-source-queue.cpp b/adaptors/devel-api/adaptor-framework/native-image-source-queue.cpp
index 960b3e4..48b8359 100755 (executable)
--- a/adaptors/devel-api/adaptor-framework/native-image-source-queue.cpp
+++ b/adaptors/devel-api/adaptor-framework/native-image-source-queue.cpp
@@ -29,13 +29,21 @@ NativeImageSourceQueuePtr NativeImageSourceQueue::New( unsigned int width, unsig
 {
   Any empty;
   NativeImageSourceQueuePtr image = new NativeImageSourceQueue( width, height, depth, empty );
-  return image;
+  if( image->mImpl )
+  {
+    return image;
+  }
+  return nullptr;
 }
 
 NativeImageSourceQueuePtr NativeImageSourceQueue::New( Any nativeImageSourceQueue )
 {
   NativeImageSourceQueuePtr image = new NativeImageSourceQueue( 0, 0, COLOR_DEPTH_DEFAULT, nativeImageSourceQueue );
-  return image;
+  if( image->mImpl )
+  {
+    return image;
+  }
+  return nullptr;
 }
 
 Any NativeImageSourceQueue::GetNativeImageSourceQueue()

diff --git a/adaptors/tizen/native-image-source-impl-tizen.cpp b/adaptors/tizen/native-image-source-impl-tizen.cpp
index 5ead8ae..33ff187 100644 (file)
--- a/adaptors/tizen/native-image-source-impl-tizen.cpp
+++ b/adaptors/tizen/native-image-source-impl-tizen.cpp
@@ -88,14 +88,13 @@ NativeImageSourceTizen::NativeImageSourceTizen( unsigned int width, unsigned int
   mBlendingRequired( false ),
   mColorDepth( depth ),
   mEglImageKHR( NULL ),
+  mEglFactory( NULL ),
   mEglImageExtensions( NULL ),
   mSetSource( false ),
   mNotification( NULL )
 {
   DALI_ASSERT_ALWAYS( Adaptor::IsAvailable() );
-  EglFactory& eglFactory = Adaptor::GetImplementation( Adaptor::Get() ).GetEGLFactory();
-  mEglImageExtensions = eglFactory.GetImageExtensions();
-  DALI_ASSERT_DEBUG( mEglImageExtensions );
+  mEglFactory = &( Adaptor::GetImplementation( Adaptor::Get() ).GetEGLFactory() );
 
   mTbmSurface = GetSurfaceFromAny( nativeImageSource );
 
@@ -419,6 +418,9 @@ bool NativeImageSourceTizen::GlExtensionCreate()
     return false;
   }
 
+  mEglImageExtensions = mEglFactory->GetImageExtensions();
+  DALI_ASSERT_DEBUG( mEglImageExtensions );
+
   mEglImageKHR = mEglImageExtensions->CreateImageKHR( eglBuffer );
 
   return mEglImageKHR != NULL;

diff --git a/adaptors/tizen/native-image-source-impl-tizen.h b/adaptors/tizen/native-image-source-impl-tizen.h
index 6d72fb8..aa81ad4 100644 (file)
--- a/adaptors/tizen/native-image-source-impl-tizen.h
+++ b/adaptors/tizen/native-image-source-impl-tizen.h
@@ -36,6 +36,7 @@ namespace Internal
 namespace Adaptor
 {
 
+class EglFactory;
 class EglImageExtensions;
 
 /**
@@ -191,6 +192,7 @@ private:
   bool mBlendingRequired;                      ///< Whether blending is required
   Dali::NativeImageSource::ColorDepth mColorDepth;  ///< color depth of image
   void* mEglImageKHR;                         ///< From EGL extension
+  EglFactory* mEglFactory;                    ///< EGL Factory
   EglImageExtensions* mEglImageExtensions;    ///< The EGL Image Extensions
   bool mSetSource;
   void *mNotification;

diff --git a/adaptors/tizen/native-image-source-queue-impl-tizen.cpp b/adaptors/tizen/native-image-source-queue-impl-tizen.cpp
index 60a584e..24f87f8 100644 (file)
--- a/adaptors/tizen/native-image-source-queue-impl-tizen.cpp
+++ b/adaptors/tizen/native-image-source-queue-impl-tizen.cpp
@@ -79,14 +79,13 @@ NativeImageSourceQueueTizen::NativeImageSourceQueueTizen( unsigned int width, un
   mTbmQueue( NULL ),
   mConsumeSurface( NULL ),
   mEglImages(),
+  mEglFactory( NULL ),
   mEglImageExtensions( NULL ),
   mOwnTbmQueue( false ),
   mBlendingRequired( false )
 {
   DALI_ASSERT_ALWAYS( Adaptor::IsAvailable() );
-  EglFactory& eglFactory = Adaptor::GetImplementation( Adaptor::Get() ).GetEGLFactory();
-  mEglImageExtensions = eglFactory.GetImageExtensions();
-  DALI_ASSERT_DEBUG( mEglImageExtensions );
+  mEglFactory = &( Adaptor::GetImplementation( Adaptor::Get() ).GetEGLFactory() );
 
   mTbmQueue = GetSurfaceFromAny( nativeImageSourceQueue );
 
@@ -183,6 +182,9 @@ void NativeImageSourceQueueTizen::SetSource( Any source )
 
 bool NativeImageSourceQueueTizen::GlExtensionCreate()
 {
+  mEglImageExtensions = mEglFactory->GetImageExtensions();
+  DALI_ASSERT_DEBUG( mEglImageExtensions );
+
   return true;
 }
 
@@ -206,48 +208,46 @@ void NativeImageSourceQueueTizen::PrepareTexture()
 {
   tbm_surface_h oldSurface = mConsumeSurface;
 
-  bool needToWait = ( mConsumeSurface == NULL ) ? true : false;
-
-  if( tbm_surface_queue_can_acquire( mTbmQueue, needToWait ) )
+  if( tbm_surface_queue_can_acquire( mTbmQueue, 0 ) )
   {
     if( tbm_surface_queue_acquire( mTbmQueue, &mConsumeSurface ) != TBM_SURFACE_QUEUE_ERROR_NONE )
     {
       DALI_LOG_ERROR( "Failed to aquire a tbm_surface\n" );
       return;
     }
-  }
 
-  if( oldSurface && oldSurface != mConsumeSurface )
-  {
-    if( tbm_surface_internal_is_valid( oldSurface ) )
+    if( oldSurface )
     {
-      tbm_surface_queue_release( mTbmQueue, oldSurface );
+      if( tbm_surface_internal_is_valid( oldSurface ) )
+      {
+        tbm_surface_queue_release( mTbmQueue, oldSurface );
+      }
     }
-  }
 
-  if( mConsumeSurface )
-  {
-    bool existing = false;
-    for( auto&& iter : mEglImages )
+    if( mConsumeSurface )
     {
-      if( iter.first == mConsumeSurface )
+      bool existing = false;
+      for( auto&& iter : mEglImages )
       {
-        // Find the surface in the existing list
-        existing = true;
-        mEglImageExtensions->TargetTextureKHR( iter.second );
-        break;
+        if( iter.first == mConsumeSurface )
+        {
+          // Find the surface in the existing list
+          existing = true;
+          mEglImageExtensions->TargetTextureKHR( iter.second );
+          break;
+        }
       }
-    }
 
-    if( !existing )
-    {
-      // Push the surface
-      tbm_surface_internal_ref( mConsumeSurface );
+      if( !existing )
+      {
+        // Push the surface
+        tbm_surface_internal_ref( mConsumeSurface );
 
-      void* eglImageKHR = mEglImageExtensions->CreateImageKHR( reinterpret_cast< EGLClientBuffer >( mConsumeSurface ) );
-      mEglImageExtensions->TargetTextureKHR( eglImageKHR );
+        void* eglImageKHR = mEglImageExtensions->CreateImageKHR( reinterpret_cast< EGLClientBuffer >( mConsumeSurface ) );
+        mEglImageExtensions->TargetTextureKHR( eglImageKHR );
 
-      mEglImages.push_back( EglImagePair( mConsumeSurface, eglImageKHR) );
+        mEglImages.push_back( EglImagePair( mConsumeSurface, eglImageKHR) );
+      }
     }
   }
 }

diff --git a/adaptors/tizen/native-image-source-queue-impl-tizen.h b/adaptors/tizen/native-image-source-queue-impl-tizen.h
index 4f9ff6d..28f77cd 100755 (executable)
--- a/adaptors/tizen/native-image-source-queue-impl-tizen.h
+++ b/adaptors/tizen/native-image-source-queue-impl-tizen.h
@@ -36,6 +36,7 @@ namespace Internal
 namespace Adaptor
 {
 
+class EglFactory;
 class EglImageExtensions;
 
 /**
@@ -171,6 +172,7 @@ private:
   tbm_surface_queue_h              mTbmQueue;             ///< Tbm surface queue handle
   tbm_surface_h                    mConsumeSurface;       ///< The current tbm surface
   std::vector< EglImagePair >      mEglImages;            ///< EGL Image vector
+  EglFactory*                      mEglFactory;           ///< EGL Factory
   EglImageExtensions*              mEglImageExtensions;   ///< The EGL Image Extensions
   bool                             mOwnTbmQueue;          ///< Whether we created tbm queue
   bool                             mBlendingRequired;     ///< Whether blending is required