X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftest-native-image.h;h=bd1bfcc141997419604098457aecd9174f2ef662;hb=6a219d0bbcfd016e24b5466d5fb1a666c92feae5;hp=7a4f552fe18c231be74586888873536eae251a56;hpb=cef353d5b0add148dd99197bf25fb47a9c23d4d9;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-native-image.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-native-image.h
index 7a4f552..bd1bfcc 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-native-image.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-native-image.h
@@ -78,10 +78,22 @@ public:
     mCallStack.PushCall("GetTextureTarget", "");
     return GL_TEXTURE_EXTERNAL_OES;
   };
-  inline virtual const char* GetCustomFragmentPrefix() const
+  inline virtual bool ApplyNativeFragmentShader(std::string& shader)
   {
-    mCallStack.PushCall("GetCustomFragmentPrefix", "");
-    return "#extension GL_OES_EGL_image_external:require\n";
+    mCallStack.PushCall("ApplyNativeFragmentShader", "");
+    shader = "#extension GL_OES_EGL_image_external:require\n" + shader;
+
+    //Get custom sampler type name
+    const char* customSamplerTypename = GetCustomSamplerTypename();
+    if(customSamplerTypename)
+    {
+      size_t samplerPosition = shader.find("sampler2D");
+      if(samplerPosition != std::string::npos)
+      {
+        shader.replace(samplerPosition, strlen("sampler2D"), customSamplerTypename);
+      }
+    }
+    return true;
   };
   inline const char* GetCustomSamplerTypename() const override
   {
@@ -116,7 +128,7 @@ public:
   int32_t                mTargetTextureCalls;
   uint32_t               mTargetTextureError{0u};
   bool                   createResult;
-  mutable TraceCallStack mCallStack{"NativeImage:"};
+  mutable TraceCallStack mCallStack;
 };
 
 } // namespace Dali