Revert "Add handling TBM queue"

This reverts commit 3753dc57e571fa4b424f16ca28d035208cc652e1.

Requested by Daekwang Ryu(dkdk.ryu@samsung.com)

diff --git a/dali-extension/internal/evas-plugin/scene-impl.cpp b/dali-extension/internal/evas-plugin/scene-impl.cpp
index c511bd6..035c7fc 100644 (file)
--- a/dali-extension/internal/evas-plugin/scene-impl.cpp
+++ b/dali-extension/internal/evas-plugin/scene-impl.cpp
@@ -14,12 +14,8 @@
  * limitations under the License.
  *
  */
-// CLASS HEADER
-#include <dali-extension/internal/evas-plugin/scene-impl.h>
 
 // EXTERNAL INCLUDES
-#include <tbm_surface_queue.h>
-#include <tbm_surface_internal.h>
 #include <dali/devel-api/adaptor-framework/clipboard.h>
 #include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/integration-api/adaptor-framework/native-render-surface.h>
@@ -35,6 +31,9 @@
 #include <dali-extension/internal/evas-plugin/evas-plugin-impl.h>
 #include <dali-extension/internal/evas-plugin/evas-wrapper.h>
 
+// CLASS HEADER
+#include <dali-extension/internal/evas-plugin/scene-impl.h>
+
 namespace Dali
 {
 
@@ -56,8 +55,7 @@ Scene::Scene( Evas_Object* parentEvasObject, uint16_t width, uint16_t height, bo
   mEvasEventHandler(),
   mRenderNotification(),
   mIsFocus( false ),
-  mIsTranslucent( isTranslucent ),
-  mConsumeSurface( nullptr )
+  mIsTranslucent( isTranslucent )
 {
   DALI_ASSERT_ALWAYS( parentEvasObject && "No parent object for the scene" );
 
@@ -209,31 +207,14 @@ void Scene::OnPostRender()
     return;
   }
 
-  tbm_surface_queue_h tbmQueue = AnyCast<tbm_surface_queue_h>( surface->GetNativeRenderable() );
+  tbm_surface_h tbmSurface = AnyCast<tbm_surface_h>( surface->GetDrawable() );
 
-  if( tbm_surface_queue_can_acquire( tbmQueue, 1 ) )
+  if( !tbmSurface )
   {
-    tbm_surface_h oldSurface = mConsumeSurface;
-
-    if( tbm_surface_queue_acquire( tbmQueue, &mConsumeSurface ) != TBM_SURFACE_QUEUE_ERROR_NONE )
-    {
-      DALI_LOG_ERROR( "Failed to acquire a tbm_surface\n" );
-      return;
-    }
-
-    if ( mConsumeSurface )
-    {
-      tbm_surface_internal_ref( mConsumeSurface );
-
-      tbm_surface_internal_unref( oldSurface );
-      if( tbm_surface_internal_is_valid( oldSurface ) )
-      {
-        tbm_surface_queue_release( tbmQueue, oldSurface );
-      }
-    }
+    return;
   }
 
-  mEvasWrapper->BindTBMSurface( mConsumeSurface );
+  mEvasWrapper->BindTBMSurface( tbmSurface );
 
   mEvasWrapper->RequestRender();
 

diff --git a/dali-extension/internal/evas-plugin/scene-impl.h b/dali-extension/internal/evas-plugin/scene-impl.h
index 21344a2..c31b70e 100644 (file)
--- a/dali-extension/internal/evas-plugin/scene-impl.h
+++ b/dali-extension/internal/evas-plugin/scene-impl.h
@@ -21,7 +21,6 @@
 // EXTERNAL INCLUDES
 #include <memory>
 #include <Ecore_IMF_Evas.h>
-#include <tbm_surface.h>
 
 #include <dali/integration-api/adaptor-framework/scene-holder-impl.h>
 #include <dali/public-api/common/intrusive-ptr.h>
@@ -266,7 +265,6 @@ private:
 
   bool                                      mIsFocus;
   bool                                      mIsTranslucent;
-  tbm_surface_h                             mConsumeSurface;
 };
 
 inline Scene& GetImplementation( Extension::Scene& scene )