From 953f103bba3c47e2aa11f7db831d2d0e6a21dbc2 Mon Sep 17 00:00:00 2001 From: Agnelo Vaz Date: Mon, 31 Oct 2016 17:23:35 +0000 Subject: [PATCH 1/1] Emboss filter not to use Texture Set explictly Change-Id: I830d6e7c96eed6c5d0d92f72f5e8b249c32213ae --- dali-toolkit/internal/filters/emboss-filter.cpp | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/dali-toolkit/internal/filters/emboss-filter.cpp b/dali-toolkit/internal/filters/emboss-filter.cpp index 2a0c81d..849e81b 100644 --- a/dali-toolkit/internal/filters/emboss-filter.cpp +++ b/dali-toolkit/internal/filters/emboss-filter.cpp @@ -127,22 +127,11 @@ void EmbossFilter::Enable() mRootActor.Add( mActorForComposite ); - Image dummyImage; // Dummy image, force creation of an image visual - - InitializeVisual( mActorForComposite, mVisualForEmboss1, dummyImage ); + InitializeVisual( mActorForComposite, mVisualForEmboss1, mImageForEmboss1 ); Toolkit::GetImplementation( mVisualForEmboss1 ).SetCustomShader( customShader ); - - InitializeVisual( mActorForComposite, mVisualForEmboss2, dummyImage ); - Toolkit::GetImplementation( mVisualForEmboss2 ).SetCustomShader( customShader ); - - TextureSet textureSet1 = TextureSet::New(); - TextureSetImage( textureSet1, 0, mImageForEmboss1 ); - mActorForComposite.GetRendererAt(0).SetTextures( textureSet1 ); mActorForComposite.GetRendererAt(0).RegisterProperty( COLOR_UNIFORM_NAME, Color::BLACK ); - - TextureSet textureSet2 = TextureSet::New(); - TextureSetImage( textureSet2, 0, mImageForEmboss2 ); - mActorForComposite.GetRendererAt(1).SetTextures( textureSet2 ); + InitializeVisual( mActorForComposite, mVisualForEmboss2, mImageForEmboss2 ); + Toolkit::GetImplementation( mVisualForEmboss2 ).SetCustomShader( customShader ); mActorForComposite.GetRendererAt(1).RegisterProperty( COLOR_UNIFORM_NAME, Color::WHITE ); SetupCamera(); -- 2.7.4