From: junsu choi <jsuya.choi@samsung.com>
Date: Mon, 8 Nov 2021 05:45:50 +0000 (+0000)
Subject: Merge "CanvasView: Do ApplyNativeFragmentShader for NativeImage buffer" into devel... 
X-Git-Tag: dali_2.0.52~4
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=e8a0d6cffda02a66a542fe89240fb41bc7c08215;hp=dbec4b85b9c75107c364e76870ace1a10c243829

Merge "CanvasView: Do ApplyNativeFragmentShader for NativeImage buffer" into devel/master
---

diff --git a/dali-toolkit/internal/controls/canvas-view/canvas-view-impl.cpp b/dali-toolkit/internal/controls/canvas-view/canvas-view-impl.cpp
index 1540b02..e8fefbf 100644
--- a/dali-toolkit/internal/controls/canvas-view/canvas-view-impl.cpp
+++ b/dali-toolkit/internal/controls/canvas-view/canvas-view-impl.cpp
@@ -23,6 +23,7 @@
 #include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/public-api/object/type-registry-helper.h>
 #include <dali/public-api/object/type-registry.h>
+#include <dali/devel-api/rendering/texture-devel.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/controls/control-devel.h>
@@ -202,10 +203,14 @@ void CanvasView::ApplyRasterizedImage(Texture rasterizedTexture)
   {
     if(!mTextureSet)
     {
+      std::string fragmentShader = SHADER_CANVAS_VIEW_FRAG.data();
+      DevelTexture::ApplyNativeFragmentShader(rasterizedTexture, fragmentShader);
+
       mTextureSet       = TextureSet::New();
       Geometry geometry = VisualFactoryCache::CreateQuadGeometry();
-      Shader   shader   = Shader::New(SHADER_CANVAS_VIEW_VERT, SHADER_CANVAS_VIEW_FRAG);
+      Shader   shader   = Shader::New(SHADER_CANVAS_VIEW_VERT, fragmentShader);
       Renderer renderer = Renderer::New(geometry, shader);
+
       renderer.SetTextures(mTextureSet);
       renderer.SetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA, true);
       Self().AddRenderer(renderer);