From: Sunghyun Kim <scholb.kim@samsung.com>
Date: Wed, 3 Jun 2020 10:07:54 +0000 (+0900)
Subject: Fix CreateShader() for use EffectMap
X-Git-Tag: submit/tizen/20200615.014339~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F92%2F235292%2F3;p=platform%2Fcore%2Fuifw%2Fwidget-viewer-dali.git

Fix CreateShader() for use EffectMap

SetEffectPropertyMap is not working when application use
samplerExternalOES in custom shader.
so i modified to replace the shader only if appropriate

Change-Id: Id610dc03ebe0b043f013e11899090378298169a6
---

diff --git a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
index cc3511c..8419d1f 100644
--- a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
+++ b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
@@ -1596,7 +1596,11 @@ Dali::Shader WidgetView::CreateShader()
         DALI_LOG_ERROR( "'%s' parameter does not correctly specify a string\n", CUSTOM_FRAGMENT_SHADER );
       }
       fragmentShader += customFragmentShader;
-      fragmentShader.replace( fragmentShader.find( DEFAULT_SAMPLER_TYPE_NAME ), strlen( DEFAULT_SAMPLER_TYPE_NAME ), CUSTOM_SAMPLER_TYPE_NAME );
+      std::size_t found = fragmentShader.find( DEFAULT_SAMPLER_TYPE_NAME );
+      if( found != std::string::npos )
+      {
+        fragmentShader.replace( found , strlen( DEFAULT_SAMPLER_TYPE_NAME ), CUSTOM_SAMPLER_TYPE_NAME );
+      }
     }
     else
     {