From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Tue, 24 Aug 2021 18:01:24 +0000 (+0000)
Subject: Merge "Remove unused custom shader prefix method" into devel/master
X-Git-Tag: dali_2.0.41~1
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-core.git;a=commitdiff_plain;h=350c4bfa8b96c69886abdeddc7ba0ba670778e5c;hp=e1aab2dc308acc7f0836fd59c9b32b1af641f06f

Merge "Remove unused custom shader prefix method" into devel/master
---

diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-native-image.h b/automated-tests/src/dali/dali-test-suite-utils/test-native-image.h
index fb9451c..bd1bfcc 100644
--- a/automated-tests/src/dali/dali-test-suite-utils/test-native-image.h
+++ b/automated-tests/src/dali/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/automated-tests/src/dali/utc-Dali-Texture.cpp b/automated-tests/src/dali/utc-Dali-Texture.cpp
index 60b568d..acac5fd 100644
--- a/automated-tests/src/dali/utc-Dali-Texture.cpp
+++ b/automated-tests/src/dali/utc-Dali-Texture.cpp
@@ -1048,7 +1048,7 @@ int UtcDaliTextureApplyFragShaderP1(void)
   std::string fragShader = baseFragShader;
   bool        applied    = DevelTexture::ApplyNativeFragmentShader(nativeTexture, fragShader);
 
-  std::string fragPrefix = testNativeImage->GetCustomFragmentPrefix();
+  std::string fragPrefix = "#extension GL_OES_EGL_image_external:require\n";
 
   DALI_TEST_CHECK(applied);
   DALI_TEST_CHECK(baseFragShader.compare(fragShader));
diff --git a/dali/public-api/images/native-image-interface.h b/dali/public-api/images/native-image-interface.h
index d69643e..ef60e4d 100644
--- a/dali/public-api/images/native-image-interface.h
+++ b/dali/public-api/images/native-image-interface.h
@@ -114,14 +114,6 @@ public:
   virtual int GetTextureTarget() const = 0;
 
   /**
-   * @brief Get custom fragment prefix for rendering native image.
-   *
-   * @SINCE_1_9.23
-   * @return Custom fragment prefix code as string.
-   */
-  virtual const char* GetCustomFragmentPrefix() const = 0;
-
-  /**
    * @brief Apply custom fragment prefix for rendering native image.
    *
    * @param[in,out] shader shader code that will be applied fragment prefix.