Revert "[3.0] TC fail because of tbm surface is not supporting specific color depth"

This reverts commit 27493811a37274fa58201ea6f01ab17a124f3324.
Change-Id: Ibfdfa9691c7a13accd69a670d6eda1d46135f0bf

diff --git a/adaptors/public-api/adaptor-framework/native-image-source.cpp b/adaptors/public-api/adaptor-framework/native-image-source.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 6996e73..c4764e4
--- a/adaptors/public-api/adaptor-framework/native-image-source.cpp
+++ b/adaptors/public-api/adaptor-framework/native-image-source.cpp
@@ -60,11 +60,6 @@ void NativeImageSource::SetSource( Any source )
   mImpl->SetSource( source );
 }
 
-bool NativeImageSource::IsColorDepthSupported( ColorDepth colorDepth )
-{
-  return mImpl->IsColorDepthSupported( colorDepth );
-}
-
 bool NativeImageSource::GlExtensionCreate()
 {
   return mImpl->GlExtensionCreate();

diff --git a/adaptors/public-api/adaptor-framework/native-image-source.h b/adaptors/public-api/adaptor-framework/native-image-source.h
old mode 100755 (executable)
new mode 100644 (file)
index d26511c..2f833d9
--- a/adaptors/public-api/adaptor-framework/native-image-source.h
+++ b/adaptors/public-api/adaptor-framework/native-image-source.h
@@ -136,15 +136,6 @@ public:
    */
   void SetSource( Any source );
 
-  /**
-   * @brief Check if the specified color depth is supported.
-   *
-   * @SINCE_1_1.34
-   * @param[in] colorDepth The color depth to check.
-   * @return true if colorDepth is supported, false otherwise.
-   */
-  bool IsColorDepthSupported( ColorDepth colorDepth );
-
 private:   // native image
 
   /**

diff --git a/adaptors/tizen/native-image-source-impl-tizen.cpp b/adaptors/tizen/native-image-source-impl-tizen.cpp
old mode 100755 (executable)
new mode 100644 (file)
index f3952ae..f9d1923
--- a/adaptors/tizen/native-image-source-impl-tizen.cpp
+++ b/adaptors/tizen/native-image-source-impl-tizen.cpp
@@ -311,57 +311,6 @@ void NativeImageSource::SetSource( Any source )
   }
 }
 
-bool NativeImageSource::IsColorDepthSupported( Dali::NativeImageSource::ColorDepth colorDepth )
-{
-  uint32_t* formats;
-  uint32_t formatNum;
-  tbm_format format = TBM_FORMAT_RGB888;
-
-  switch( colorDepth )
-  {
-    case Dali::NativeImageSource::COLOR_DEPTH_DEFAULT:
-    {
-      format = TBM_FORMAT_RGBA8888;
-      break;
-    }
-    case Dali::NativeImageSource::COLOR_DEPTH_8:
-    {
-      format = TBM_FORMAT_C8;
-      break;
-    }
-    case Dali::NativeImageSource::COLOR_DEPTH_16:
-    {
-      format = TBM_FORMAT_RGB565;
-      break;
-    }
-    case Dali::NativeImageSource::COLOR_DEPTH_24:
-    {
-      format = TBM_FORMAT_RGB888;
-      break;
-    }
-    case Dali::NativeImageSource::COLOR_DEPTH_32:
-    {
-      format = TBM_FORMAT_RGBA8888;
-      break;
-    }
-  }
-
-  if( tbm_surface_query_formats( &formats, &formatNum ) )
-  {
-    for( unsigned int i = 0; i < formatNum; i++ )
-    {
-      if( formats[i] == format )
-      {
-        free( formats );
-        return true;
-      }
-    }
-  }
-
-  free( formats );
-  return false;
-}
-
 bool NativeImageSource::GlExtensionCreate()
 {
   if( mEglImageKHR != NULL )

diff --git a/adaptors/tizen/native-image-source-impl.h b/adaptors/tizen/native-image-source-impl.h
old mode 100755 (executable)
new mode 100644 (file)
index ceb1c50..5e251b7
--- a/adaptors/tizen/native-image-source-impl.h
+++ b/adaptors/tizen/native-image-source-impl.h
@@ -77,11 +77,6 @@ public:
   void SetSource( Any source );
 
   /**
-   * @copydoc Dali::NativeImageSource::IsColorDepthSupported( ColorDepth colorDepth )
-   */
-  bool IsColorDepthSupported( Dali::NativeImageSource::ColorDepth colorDepth );
-
-  /**
    * destructor
    */
   ~NativeImageSource();

diff --git a/adaptors/x11/native-image-source-impl-x.cpp b/adaptors/x11/native-image-source-impl-x.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 1131d58..f97b681
--- a/adaptors/x11/native-image-source-impl-x.cpp
+++ b/adaptors/x11/native-image-source-impl-x.cpp
@@ -287,11 +287,6 @@ void NativeImageSource::SetSource( Any source )
   }
 }
 
-bool NativeImageSource::IsColorDepthSupported( Dali::NativeImageSource::ColorDepth colorDepth )
-{
-  return true;
-}
-
 bool NativeImageSource::GlExtensionCreate()
 {
   // if the image existed previously delete it.

diff --git a/adaptors/x11/native-image-source-impl.h b/adaptors/x11/native-image-source-impl.h
old mode 100755 (executable)
new mode 100644 (file)
index b581722..20f4585
--- a/adaptors/x11/native-image-source-impl.h
+++ b/adaptors/x11/native-image-source-impl.h
@@ -75,11 +75,6 @@ public:
   void SetSource( Any source );
 
   /**
-   * @copydoc Dali::NativeImageSource::IsColorDepthSupported( ColorDepth colorDepth )
-   */
-  bool IsColorDepthSupported( Dali::NativeImageSource::ColorDepth colorDepth );
-
-  /**
    * destructor
    */
   ~NativeImageSource();