Remove unused custom shader prefix method

Change-Id: I7e376ba6d4ac9250d7b6971476514086d16cd454
Signed-off-by: seungho <sbsh.baek@samsung.com>

diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-native-image.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-native-image.h
index fb9451c..bd1bfcc 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-native-image.h
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-native-image.h
@@ -78,11 +78,6 @@ public:
     mCallStack.PushCall("GetTextureTarget", "");
     return GL_TEXTURE_EXTERNAL_OES;
   };
-  inline virtual const char* GetCustomFragmentPrefix() const
-  {
-    mCallStack.PushCall("GetCustomFragmentPrefix", "");
-    return "#extension GL_OES_EGL_image_external:require\n";
-  };
   inline virtual bool ApplyNativeFragmentShader(std::string& shader)
   {
     mCallStack.PushCall("ApplyNativeFragmentShader", "");

diff --git a/dali/devel-api/adaptor-framework/native-image-source-queue.cpp b/dali/devel-api/adaptor-framework/native-image-source-queue.cpp
index b148c1b..d55e178 100644 (file)
--- a/dali/devel-api/adaptor-framework/native-image-source-queue.cpp
+++ b/dali/devel-api/adaptor-framework/native-image-source-queue.cpp
@@ -116,11 +116,6 @@ int NativeImageSourceQueue::GetTextureTarget() const
   return mImpl->GetTextureTarget();
 }
 
-const char* NativeImageSourceQueue::GetCustomFragmentPrefix() const
-{
-  return mImpl->GetCustomFragmentPrefix();
-}
-
 bool NativeImageSourceQueue::ApplyNativeFragmentShader(std::string& shader)
 {
   return mImpl->ApplyNativeFragmentShader(shader);

diff --git a/dali/devel-api/adaptor-framework/native-image-source-queue.h b/dali/devel-api/adaptor-framework/native-image-source-queue.h
index 0666d0e..cb62fc1 100644 (file)
--- a/dali/devel-api/adaptor-framework/native-image-source-queue.h
+++ b/dali/devel-api/adaptor-framework/native-image-source-queue.h
@@ -146,11 +146,6 @@ public:
   int GetTextureTarget() const override;
 
   /**
-   * @copydoc Dali::NativeImageInterface::GetCustomFragmentPrefix()
-   */
-  const char* GetCustomFragmentPrefix() const override;
-
-  /**
    * @copydoc Dali::NativeImageInterface::ApplyNativeFragmentShader()
    */
   bool ApplyNativeFragmentShader(std::string& shader) override;

diff --git a/dali/internal/imaging/android/native-image-source-impl-android.cpp b/dali/internal/imaging/android/native-image-source-impl-android.cpp
index 9584864..e06af8e 100644 (file)
--- a/dali/internal/imaging/android/native-image-source-impl-android.cpp
+++ b/dali/internal/imaging/android/native-image-source-impl-android.cpp
@@ -303,11 +303,6 @@ int NativeImageSourceAndroid::GetTextureTarget() const
   return GL_TEXTURE_2D;
 }
 
-const char* NativeImageSourceAndroid::GetCustomFragmentPrefix() const
-{
-  return nullptr;
-}
-
 bool NativeImageSourceAndroid::ApplyNativeFragmentShader(std::string& shader)
 {
   return false;

diff --git a/dali/internal/imaging/android/native-image-source-impl-android.h b/dali/internal/imaging/android/native-image-source-impl-android.h
index 6cb21b8..1b87f5f 100644 (file)
--- a/dali/internal/imaging/android/native-image-source-impl-android.h
+++ b/dali/internal/imaging/android/native-image-source-impl-android.h
@@ -130,11 +130,6 @@ public:
   int GetTextureTarget() const override;
 
   /**
-   * @copydoc Dali::NativeImageSource::GetCustomFragmentPrefix()
-   */
-  const char* GetCustomFragmentPrefix() const override;
-
-  /**
    * @copydoc Dali::NativeImageSource::ApplyNativeFragmentShader()
    */
   bool ApplyNativeFragmentShader(std::string& shader) override;

diff --git a/dali/internal/imaging/android/native-image-source-queue-impl-android.cpp b/dali/internal/imaging/android/native-image-source-queue-impl-android.cpp
index ac9b53a..79e009f 100644 (file)
--- a/dali/internal/imaging/android/native-image-source-queue-impl-android.cpp
+++ b/dali/internal/imaging/android/native-image-source-queue-impl-android.cpp
@@ -98,11 +98,6 @@ void NativeImageSourceQueueAndroid::PrepareTexture()
 {
 }
 
-const char* NativeImageSourceQueueAndroid::GetCustomFragmentPrefix() const
-{
-  return nullptr;
-}
-
 bool NativeImageSourceQueueAndroid::ApplyNativeFragmentShader(std::string& shader)
 {
   return false;

diff --git a/dali/internal/imaging/android/native-image-source-queue-impl-android.h b/dali/internal/imaging/android/native-image-source-queue-impl-android.h
index f827cde..28a5c2e 100644 (file)
--- a/dali/internal/imaging/android/native-image-source-queue-impl-android.h
+++ b/dali/internal/imaging/android/native-image-source-queue-impl-android.h
@@ -137,11 +137,6 @@ public:
   }
 
   /**
-   * @copydoc Dali::NativeImageInterface::GetCustomFragmentPrefix()
-   */
-  const char* GetCustomFragmentPrefix() const override;
-
-  /**
    * @copydoc Dali::NativeImageInterface::ApplyNativeFragmentShader()
    */
   bool ApplyNativeFragmentShader(std::string& shader) override;

diff --git a/dali/internal/imaging/common/native-bitmap-buffer-impl.cpp b/dali/internal/imaging/common/native-bitmap-buffer-impl.cpp
index e754cdb..0537f1b 100644 (file)
--- a/dali/internal/imaging/common/native-bitmap-buffer-impl.cpp
+++ b/dali/internal/imaging/common/native-bitmap-buffer-impl.cpp
@@ -110,11 +110,6 @@ int NativeBitmapBuffer::GetTextureTarget() const
   return 0;
 }
 
-const char* NativeBitmapBuffer::GetCustomFragmentPrefix() const
-{
-  return nullptr;
-}
-
 bool NativeBitmapBuffer::ApplyNativeFragmentShader(std::string& shader)
 {
   return false;

diff --git a/dali/internal/imaging/common/native-bitmap-buffer-impl.h b/dali/internal/imaging/common/native-bitmap-buffer-impl.h
index 2166c17..344334f 100644 (file)
--- a/dali/internal/imaging/common/native-bitmap-buffer-impl.h
+++ b/dali/internal/imaging/common/native-bitmap-buffer-impl.h
@@ -108,11 +108,6 @@ public:
   int GetTextureTarget() const override;
 
   /**
-   * @copydoc Dali::NativeImageInterface::GetCustomFragmentPrefix()
-   */
-  const char* GetCustomFragmentPrefix() const override;
-
-  /**
    * @copydoc Dali::NativeImageInterface::ApplyNativeFragmentShader()
    */
   bool ApplyNativeFragmentShader(std::string& shader) override;

diff --git a/dali/internal/imaging/common/native-image-source-impl.h b/dali/internal/imaging/common/native-image-source-impl.h
index 077b9e0..3dd33b2 100644 (file)
--- a/dali/internal/imaging/common/native-image-source-impl.h
+++ b/dali/internal/imaging/common/native-image-source-impl.h
@@ -115,11 +115,6 @@ public:
   virtual int GetTextureTarget() const = 0;
 
   /**
-   * @copydoc Dali::NativeImageSource::GetCustomFragmentPrefix()
-   */
-  virtual const char* GetCustomFragmentPrefix() const = 0;
-
-  /**
    * @copydoc Dali::NativeImageSource::ApplyNativeFragmentShader()
    */
   virtual bool ApplyNativeFragmentShader(std::string& shader) = 0;

diff --git a/dali/internal/imaging/common/native-image-source-queue-impl.h b/dali/internal/imaging/common/native-image-source-queue-impl.h
index d1b7ead..8c9028b 100644 (file)
--- a/dali/internal/imaging/common/native-image-source-queue-impl.h
+++ b/dali/internal/imaging/common/native-image-source-queue-impl.h
@@ -114,11 +114,6 @@ public:
   virtual int GetTextureTarget() const = 0;
 
   /**
-   * @copydoc Dali::NativeImageInterface::GetCustomFragmentPrefix()
-   */
-  virtual const char* GetCustomFragmentPrefix() const = 0;
-
-  /**
    * @copydoc Dali::NativeImageInterface::ApplyNativeFragmentShader()
    */
   virtual bool ApplyNativeFragmentShader(std::string& shader) = 0;

diff --git a/dali/internal/imaging/macos/native-image-source-impl-mac.cpp b/dali/internal/imaging/macos/native-image-source-impl-mac.cpp
index c0abb5d..3e3b33f 100644 (file)
--- a/dali/internal/imaging/macos/native-image-source-impl-mac.cpp
+++ b/dali/internal/imaging/macos/native-image-source-impl-mac.cpp
@@ -154,11 +154,6 @@ void NativeImageSourceCocoa::PrepareTexture()
 {
 }
 
-const char* NativeImageSourceCocoa::GetCustomFragmentPrefix() const
-{
-  return nullptr;
-}
-
 bool NativeImageSourceCocoa::ApplyNativeFragmentShader(std::string& shader)
 {
   return false;

diff --git a/dali/internal/imaging/macos/native-image-source-impl-mac.h b/dali/internal/imaging/macos/native-image-source-impl-mac.h
index a70f33c..6e5ed2a 100644 (file)
--- a/dali/internal/imaging/macos/native-image-source-impl-mac.h
+++ b/dali/internal/imaging/macos/native-image-source-impl-mac.h
@@ -114,11 +114,6 @@ public:
   bool RequiresBlending() const override;
 
   /**
-   * @copydoc Dali::NativeImageInterface::GetCustomFragmentPrefix()
-   */
-  const char* GetCustomFragmentPrefix() const override;
-
-  /**
    * @copydoc Dali::NativeImageInterface::ApplyNativeFragmentShader()
    */
   bool ApplyNativeFragmentShader(std::string& shader) override;

diff --git a/dali/internal/imaging/tizen/native-image-source-impl-tizen.cpp b/dali/internal/imaging/tizen/native-image-source-impl-tizen.cpp
index b3afaaa..a6e7cc6 100644 (file)
--- a/dali/internal/imaging/tizen/native-image-source-impl-tizen.cpp
+++ b/dali/internal/imaging/tizen/native-image-source-impl-tizen.cpp
@@ -38,7 +38,6 @@ namespace Adaptor
 {
 namespace
 {
-const char* FRAGMENT_PREFIX = "#extension GL_OES_EGL_image_external:require\n";
 const char* SAMPLER_TYPE    = "samplerExternalOES";
 
 // clang-format off
@@ -460,11 +459,6 @@ void NativeImageSourceTizen::PrepareTexture()
   }
 }
 
-const char* NativeImageSourceTizen::GetCustomFragmentPrefix() const
-{
-  return FRAGMENT_PREFIX;
-}
-
 bool NativeImageSourceTizen::ApplyNativeFragmentShader(std::string& shader)
 {
   return mEglGraphics->ApplyNativeFragmentShader(shader, SAMPLER_TYPE);

diff --git a/dali/internal/imaging/tizen/native-image-source-impl-tizen.h b/dali/internal/imaging/tizen/native-image-source-impl-tizen.h
index 7436a33..11569fc 100644 (file)
--- a/dali/internal/imaging/tizen/native-image-source-impl-tizen.h
+++ b/dali/internal/imaging/tizen/native-image-source-impl-tizen.h
@@ -126,11 +126,6 @@ public:
   }
 
   /**
-   * @copydoc Dali::NativeImageInterface::GetCustomFragmentPrefix()
-   */
-  const char* GetCustomFragmentPrefix() const override;
-
-  /**
    * @copydoc Dali::NativeImageInterface::ApplyNativeFragmentShader(std::string& shader)
    */
   bool ApplyNativeFragmentShader(std::string& shader) override;

diff --git a/dali/internal/imaging/tizen/native-image-source-queue-impl-tizen.cpp b/dali/internal/imaging/tizen/native-image-source-queue-impl-tizen.cpp
index 34673bc..fab4a53 100644 (file)
--- a/dali/internal/imaging/tizen/native-image-source-queue-impl-tizen.cpp
+++ b/dali/internal/imaging/tizen/native-image-source-queue-impl-tizen.cpp
@@ -38,7 +38,6 @@ namespace
 {
 #define TBM_SURFACE_QUEUE_SIZE 3
 
-const char* FRAGMENT_PREFIX = "#extension GL_OES_EGL_image_external:require\n";
 const char* SAMPLER_TYPE    = "samplerExternalOES";
 
 // clang-format off
@@ -356,11 +355,6 @@ void NativeImageSourceQueueTizen::PrepareTexture()
   }
 }
 
-const char* NativeImageSourceQueueTizen::GetCustomFragmentPrefix() const
-{
-  return FRAGMENT_PREFIX;
-}
-
 bool NativeImageSourceQueueTizen::ApplyNativeFragmentShader(std::string& shader)
 {
   return mEglGraphics->ApplyNativeFragmentShader(shader, SAMPLER_TYPE);

diff --git a/dali/internal/imaging/tizen/native-image-source-queue-impl-tizen.h b/dali/internal/imaging/tizen/native-image-source-queue-impl-tizen.h
index 3e20815..347f60a 100644 (file)
--- a/dali/internal/imaging/tizen/native-image-source-queue-impl-tizen.h
+++ b/dali/internal/imaging/tizen/native-image-source-queue-impl-tizen.h
@@ -133,11 +133,6 @@ public:
   }
 
   /**
-   * @copydoc Dali::NativeImageInterface::GetCustomFragmentPrefix()
-   */
-  const char* GetCustomFragmentPrefix() const override;
-
-  /**
    * @copydoc Dali::NativeImageInterface::ApplyNativeFragmentShader()
    */
   bool ApplyNativeFragmentShader(std::string& shader) override;

diff --git a/dali/internal/imaging/ubuntu-x11/native-image-source-impl-x.cpp b/dali/internal/imaging/ubuntu-x11/native-image-source-impl-x.cpp
index 45afbed..656c2e0 100644 (file)
--- a/dali/internal/imaging/ubuntu-x11/native-image-source-impl-x.cpp
+++ b/dali/internal/imaging/ubuntu-x11/native-image-source-impl-x.cpp
@@ -357,11 +357,6 @@ int NativeImageSourceX::GetTextureTarget() const
   return GL_TEXTURE_2D;
 }
 
-const char* NativeImageSourceX::GetCustomFragmentPrefix() const
-{
-  return nullptr;
-}
-
 bool NativeImageSourceX::ApplyNativeFragmentShader(std::string& shader)
 {
   return false;

diff --git a/dali/internal/imaging/ubuntu-x11/native-image-source-impl-x.h b/dali/internal/imaging/ubuntu-x11/native-image-source-impl-x.h
index ba132b9..e6b672c 100644 (file)
--- a/dali/internal/imaging/ubuntu-x11/native-image-source-impl-x.h
+++ b/dali/internal/imaging/ubuntu-x11/native-image-source-impl-x.h
@@ -130,11 +130,6 @@ public:
   int GetTextureTarget() const override;
 
   /**
-   * @copydoc Dali::NativeImageSource::GetCustomFragmentPrefix()
-   */
-  const char* GetCustomFragmentPrefix() const override;
-
-  /**
    * @copydoc Dali::NativeImageSource::ApplyNativeFragmentShader()
    */
   bool ApplyNativeFragmentShader(std::string& shader) override;

diff --git a/dali/internal/imaging/ubuntu-x11/native-image-source-queue-impl-x.cpp b/dali/internal/imaging/ubuntu-x11/native-image-source-queue-impl-x.cpp
index 8b4be71..8023374 100644 (file)
--- a/dali/internal/imaging/ubuntu-x11/native-image-source-queue-impl-x.cpp
+++ b/dali/internal/imaging/ubuntu-x11/native-image-source-queue-impl-x.cpp
@@ -103,11 +103,6 @@ void NativeImageSourceQueueX::PrepareTexture()
 {
 }
 
-const char* NativeImageSourceQueueX::GetCustomFragmentPrefix() const
-{
-  return nullptr;
-}
-
 bool NativeImageSourceQueueX::ApplyNativeFragmentShader(std::string& shader)
 {
   return false;

diff --git a/dali/internal/imaging/ubuntu-x11/native-image-source-queue-impl-x.h b/dali/internal/imaging/ubuntu-x11/native-image-source-queue-impl-x.h
index cde85e2..5711b6c 100644 (file)
--- a/dali/internal/imaging/ubuntu-x11/native-image-source-queue-impl-x.h
+++ b/dali/internal/imaging/ubuntu-x11/native-image-source-queue-impl-x.h
@@ -134,11 +134,6 @@ public:
   int GetTextureTarget() const override;
 
   /**
-   * @copydoc Dali::NativeImageInterface::GetCustomFragmentPrefix()
-   */
-  const char* GetCustomFragmentPrefix() const override;
-
-  /**
    * @copydoc Dali::NativeImageInterface::ApplyNativeFragmentShader()
    */
   bool ApplyNativeFragmentShader(std::string& shader) override;

diff --git a/dali/internal/imaging/windows/native-image-source-impl-win.cpp b/dali/internal/imaging/windows/native-image-source-impl-win.cpp
index ce0189b..f1997a7 100644 (file)
--- a/dali/internal/imaging/windows/native-image-source-impl-win.cpp
+++ b/dali/internal/imaging/windows/native-image-source-impl-win.cpp
@@ -228,11 +228,6 @@ void NativeImageSourceWin::GetPixmapDetails()
 {
 }
 
-const char* NativeImageSourceWin::GetCustomFragmentPrefix() const
-{
-  return nullptr;
-}
-
 bool NativeImageSourceWin::ApplyNativeFragmentShader(std::string& shader)
 {
   return false;

diff --git a/dali/internal/imaging/windows/native-image-source-impl-win.h b/dali/internal/imaging/windows/native-image-source-impl-win.h
index e47f306..8893c50 100644 (file)
--- a/dali/internal/imaging/windows/native-image-source-impl-win.h
+++ b/dali/internal/imaging/windows/native-image-source-impl-win.h
@@ -120,11 +120,6 @@ public:
   }
 
   /**
-   * @copydoc Dali::NativeImageInterface::GetCustomFragmentPrefix()
-   */
-  const char* GetCustomFragmentPrefix() const override;
-
-  /**
    * @copydoc Dali::NativeImageInterface::ApplyNativeFragmentShader()
    */
   bool ApplyNativeFragmentShader(std::string& shader) override;

diff --git a/dali/public-api/adaptor-framework/native-image-source.cpp b/dali/public-api/adaptor-framework/native-image-source.cpp
index 2f528e0..727b71b 100644 (file)
--- a/dali/public-api/adaptor-framework/native-image-source.cpp
+++ b/dali/public-api/adaptor-framework/native-image-source.cpp
@@ -105,11 +105,6 @@ int NativeImageSource::GetTextureTarget() const
   return mImpl->GetTextureTarget();
 }
 
-const char* NativeImageSource::GetCustomFragmentPrefix() const
-{
-  return mImpl->GetCustomFragmentPrefix();
-}
-
 bool NativeImageSource::ApplyNativeFragmentShader(std::string& shader)
 {
   return mImpl->ApplyNativeFragmentShader(shader);

diff --git a/dali/public-api/adaptor-framework/native-image-source.h b/dali/public-api/adaptor-framework/native-image-source.h
index 2e0e8d1..1d038b6 100644 (file)
--- a/dali/public-api/adaptor-framework/native-image-source.h
+++ b/dali/public-api/adaptor-framework/native-image-source.h
@@ -157,11 +157,6 @@ public:
   int GetTextureTarget() const override;
 
   /**
-   * @copydoc Dali::NativeImageInterface::GetCustomFragmentPrefix()
-   */
-  const char* GetCustomFragmentPrefix() const override;
-
-  /**
    * @copydoc Dali::NativeImageInterface::ApplyNativeFragmentShader()
    */
   bool ApplyNativeFragmentShader(std::string& shader) override;