From 80f789f32deb886d5a766ebfa62d0202a2a2bf4a Mon Sep 17 00:00:00 2001 From: seungho Date: Mon, 23 Aug 2021 14:14:14 +0900 Subject: [PATCH] Remove unused custom shader prefix method Change-Id: I1f9fe11db6e4d4ba324122deff111d3b66537224 Signed-off-by: seungho --- .../src/dali/dali-test-suite-utils/test-native-image.h | 5 ----- automated-tests/src/dali/utc-Dali-Texture.cpp | 2 +- dali/public-api/images/native-image-interface.h | 8 -------- 3 files changed, 1 insertion(+), 14 deletions(-) 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. -- 2.7.4