X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ffilters%2Fblur-two-pass-filter.cpp;h=ee86bb322114eabf7e7aaa7e64fd95e1e3c60bcf;hb=11ed6421771d05113ae1a6510167d8c2557ac20e;hp=b1dce9285b4e8261d6bf8167d4488558c7e7d8de;hpb=7bc9bb47cb9c552982e9144b202861190eeadc96;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/filters/blur-two-pass-filter.cpp b/dali-toolkit/internal/filters/blur-two-pass-filter.cpp index b1dce92..ee86bb3 100644 --- a/dali-toolkit/internal/filters/blur-two-pass-filter.cpp +++ b/dali-toolkit/internal/filters/blur-two-pass-filter.cpp @@ -27,6 +27,9 @@ #include #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -167,16 +170,16 @@ void BlurTwoPassFilter::Enable() fragmentSource << BLUR_TWO_PASS_FRAGMENT_SOURCE; Property::Map customShader; - customShader[ "fragmentShader" ] = fragmentSource.str(); - Property::Map rendererMap; - rendererMap.Insert( "shader", customShader ); - mActorForInput.SetProperty( Toolkit::ImageView::Property::IMAGE, rendererMap ); - mActorForHorz.SetProperty( Toolkit::ImageView::Property::IMAGE, rendererMap ); + customShader[ Toolkit::Visual::Shader::Property::FRAGMENT_SHADER ] = fragmentSource.str(); + Property::Map visualMap; + visualMap.Insert( Toolkit::Visual::Property::SHADER, customShader ); + mActorForInput.SetProperty( Toolkit::ImageView::Property::IMAGE, visualMap ); + mActorForHorz.SetProperty( Toolkit::ImageView::Property::IMAGE, visualMap ); // Set up blend-two-image custom shader - customShader[ "fragmentShader" ] = BLEND_TWO_IMAGES_FRAGMENT_SOURCE; - rendererMap[ "shader"] = customShader; - mActorForBlending.SetProperty( Toolkit::ImageView::Property::IMAGE, rendererMap ); + customShader[ Toolkit::Visual::Shader::Property::FRAGMENT_SHADER ] = BLEND_TWO_IMAGES_FRAGMENT_SOURCE; + visualMap[ Toolkit::Visual::Property::SHADER ] = customShader; + mActorForBlending.SetProperty( Toolkit::ImageView::Property::IMAGE, visualMap ); mRootActor.Add( mActorForInput ); mRootActor.Add( mActorForHorz );