[4.0] Support custom shader in svg visual

Change-Id: I928296c64c614c8e4cf9b8bfb1258f90d651a1e9

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp
index bf54997e71a1a20373286200c784c4bc0c2c0aa5..ee8010b6e6ae963dbc522b7de16e3a929dbec9c0 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp
@@ -19,6 +19,7 @@
 #include <unistd.h>
 
 #include <dali-toolkit-test-suite-utils.h>
+#include <toolkit-event-thread-callback.h>
 #include <dali/devel-api/object/handle-devel.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
@@ -2998,6 +2999,133 @@ int UtcDaliNPatchVisualCustomShader(void)
   END_TEST;
 }
 
+int UtcDaliSvgVisualCustomShader(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline( "SvgVisual with custom shader" );
+
+  // Vertex & fragment shader
+  const std::string vertexShader = "Foobar";
+  const std::string fragmentShader = "Foobar";
+  Property::Map properties;
+  Property::Map shaderProperty1;
+  shaderProperty1[Dali::Toolkit::Visual::Shader::Property::VERTEX_SHADER] = vertexShader;
+  shaderProperty1[Dali::Toolkit::Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader;
+
+  properties[Visual::Property::TYPE] = Visual::SVG;
+  properties[Visual::Property::SHADER] = shaderProperty1;
+  properties[ImageVisual::Property::URL] = TEST_SVG_FILE_NAME;
+
+  VisualFactory factory = VisualFactory::Get();
+  Visual::Base visual = factory.CreateVisual( properties );
+
+  // trigger creation through setting on stage
+  DummyControl dummy = DummyControl::New( true );
+  Impl::DummyControl& dummyImpl1 = static_cast< Impl::DummyControl& >( dummy.GetImplementation() );
+
+  dummyImpl1.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  dummy.SetSize( 200, 200 );
+  Stage::GetCurrent().Add( dummy );
+
+  visual.SetTransformAndSize( DefaultTransform(), Vector2( 100, 100 ) );
+
+  application.SendNotification();
+
+  // Wait for image to load
+  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+
+  application.SendNotification();
+  application.Render();
+
+  Renderer renderer = dummy.GetRendererAt( 0 );
+  Shader shader = renderer.GetShader();
+  Property::Value value = shader.GetProperty( Shader::Property::PROGRAM );
+  Property::Map* map = value.GetMap();
+  DALI_TEST_CHECK( map );
+
+  Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp
+  DALI_TEST_EQUALS( vertexShader, vertex->Get< std::string >(), TEST_LOCATION );
+
+  Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp
+  DALI_TEST_EQUALS( fragmentShader, fragment->Get< std::string >(), TEST_LOCATION );
+
+  // Vertex shader only
+  Property::Map shaderProperty2;
+  shaderProperty2[Dali::Toolkit::Visual::Shader::Property::VERTEX_SHADER] = vertexShader;
+
+  properties[Visual::Property::TYPE] = Visual::SVG;
+  properties[Visual::Property::SHADER] = shaderProperty2;
+  properties[ImageVisual::Property::URL] = TEST_SVG_FILE_NAME;
+
+  visual = factory.CreateVisual( properties );
+
+  // trigger creation through setting on stage
+  dummy = DummyControl::New( true );
+  Impl::DummyControl& dummyImpl2 = static_cast< Impl::DummyControl& >( dummy.GetImplementation() );
+
+  dummyImpl2.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  dummy.SetSize( 200, 200 );
+  Stage::GetCurrent().Add( dummy );
+
+  visual.SetTransformAndSize( DefaultTransform(), Vector2( 100, 100 ) );
+
+  application.SendNotification();
+
+  // Wait for image to load
+  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+
+  application.SendNotification();
+  application.Render();
+
+  renderer = dummy.GetRendererAt( 0 );
+  shader = renderer.GetShader();
+  value = shader.GetProperty( Shader::Property::PROGRAM );
+  map = value.GetMap();
+  DALI_TEST_CHECK( map );
+
+  vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp
+  DALI_TEST_EQUALS( vertexShader, vertex->Get< std::string >(), TEST_LOCATION );
+
+  // Fragment shader only
+  Property::Map shaderProperty3;
+  shaderProperty3[Dali::Toolkit::Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader;
+
+  properties[Visual::Property::TYPE] = Visual::SVG;
+  properties[Visual::Property::SHADER] = shaderProperty3;
+  properties[ImageVisual::Property::URL] = TEST_SVG_FILE_NAME;
+
+  visual = factory.CreateVisual( properties );
+
+  // trigger creation through setting on stage
+  dummy = DummyControl::New( true );
+  Impl::DummyControl& dummyImpl3 = static_cast< Impl::DummyControl& >( dummy.GetImplementation() );
+
+  dummyImpl3.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  dummy.SetSize( 200, 200 );
+  Stage::GetCurrent().Add( dummy );
+
+  visual.SetTransformAndSize( DefaultTransform(), Vector2( 100, 100 ) );
+
+  application.SendNotification();
+
+  // Wait for image to load
+  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+
+  application.SendNotification();
+  application.Render();
+
+  renderer = dummy.GetRendererAt( 0 );
+  shader = renderer.GetShader();
+  value = shader.GetProperty( Shader::Property::PROGRAM );
+  map = value.GetMap();
+  DALI_TEST_CHECK( map );
+
+  fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp
+  DALI_TEST_EQUALS( fragmentShader, fragment->Get< std::string >(), TEST_LOCATION );
+
+  END_TEST;
+}
+
 int UtcDaliGradientVisualBlendMode(void)
 {
   ToolkitTestApplication application;

diff --git a/dali-toolkit/internal/visuals/image/image-visual.cpp b/dali-toolkit/internal/visuals/image/image-visual.cpp
index 51924f0d7b68330124dcfad71c0e5501d4b4f9ef..62e4f9906b227157a3bf4acfa9d5e0ecf1d274a6 100644 (file)
--- a/dali-toolkit/internal/visuals/image/image-visual.cpp
+++ b/dali-toolkit/internal/visuals/image/image-visual.cpp
@@ -1039,6 +1039,16 @@ Shader ImageVisual::GetImageShader( VisualFactoryCache& factoryCache, bool atlas
   return shader;
 }
 
+const char* ImageVisual::GetStandardVertexShader()
+{
+  return VERTEX_SHADER;
+}
+
+const char* ImageVisual::GetStandardFrgamentShader()
+{
+  return FRAGMENT_SHADER_NO_ATLAS;
+}
+
 void ImageVisual::ApplyImageToSampler( const Image& image )
 {
   if( image )

diff --git a/dali-toolkit/internal/visuals/image/image-visual.h b/dali-toolkit/internal/visuals/image/image-visual.h
index d78cecaa937ede0a21c27082fc0e1215c4fe2dcd..e3b8e610b7989c741893240726d45e62b565a2b6 100644 (file)
--- a/dali-toolkit/internal/visuals/image/image-visual.h
+++ b/dali-toolkit/internal/visuals/image/image-visual.h
@@ -250,6 +250,16 @@ public:
    */
   static Shader GetImageShader( VisualFactoryCache& factoryCache, bool atlasing, bool defaultTextureWrapping );
 
+  /**
+   * Get the standard vertex shader code.
+   */
+  static const char* GetStandardVertexShader();
+
+  /**
+   * Get the standard fragment shader code.
+   */
+  static const char* GetStandardFrgamentShader();
+
   /**
    * @copydoc AtlasUploadObserver::UploadCompleted
    *

diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.cpp b/dali-toolkit/internal/visuals/svg/svg-visual.cpp
index eef883c90b6b5d5d1c62c21ef6b03466271b4d16..b37bddb2099ddaff53008b8ac37b62a24a7c35b7 100644 (file)
--- a/dali-toolkit/internal/visuals/svg/svg-visual.cpp
+++ b/dali-toolkit/internal/visuals/svg/svg-visual.cpp
@@ -125,7 +125,20 @@ void SvgVisual::DoSetProperty( Property::Index index, const Property::Value& val
 
 void SvgVisual::DoSetOnStage( Actor& actor )
 {
-  Shader shader = ImageVisual::GetImageShader( mFactoryCache, mAttemptAtlasing, true );
+  Shader shader;
+  if( !mImpl->mCustomShader )
+  {
+    shader = ImageVisual::GetImageShader( mFactoryCache, mAttemptAtlasing, true );
+  }
+  else
+  {
+    shader  = Shader::New( mImpl->mCustomShader->mVertexShader.empty() ? ImageVisual::GetStandardVertexShader() : mImpl->mCustomShader->mVertexShader,
+                           mImpl->mCustomShader->mFragmentShader.empty() ? ImageVisual::GetStandardFrgamentShader() : mImpl->mCustomShader->mFragmentShader,
+                           mImpl->mCustomShader->mHints );
+
+    shader.RegisterProperty( PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT );
+  }
+
   Geometry geometry = mFactoryCache.GetGeometry( VisualFactoryCache::QUAD_GEOMETRY );
   TextureSet textureSet = TextureSet::New();
   mImpl->mRenderer = Renderer::New( geometry, shader );
@@ -216,7 +229,7 @@ void SvgVisual::ApplyRasterizedImage( PixelData rasterizedPixelData )
 
     TextureSet textureSet;
 
-    if( mAttemptAtlasing )
+    if( mAttemptAtlasing && !mImpl->mCustomShader )
     {
       Vector4 atlasRect;
       textureSet = mFactoryCache.GetAtlasManager()->Add(atlasRect, rasterizedPixelData );