X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbloom-view%2Fbloom-view-impl.cpp;h=8c167abd43c7d946d82d07506dfcd7ca9e56b0b3;hb=13f73abbc38eb319e54c0c1310bb4aa43d86ce6d;hp=d98cfd998e6d2a6aa86c552500b22b69559a0d4a;hpb=3eb60a0aef6b188727b79bdee2e35c575c432a90;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp index d98cfd9..8c167ab 100644 --- a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp +++ b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp @@ -33,8 +33,8 @@ // INTERNAL INCLUDES #include -#include #include +#include #include namespace Dali @@ -378,7 +378,7 @@ void BloomView::AllocateResources() Property::Map customShader; customShader[ Toolkit::Visual::Shader::Property::FRAGMENT_SHADER ] = BLOOM_EXTRACT_FRAGMENT_SOURCE; Property::Map visualMap; - visualMap.Insert( Toolkit::Visual::Property::SHADER, customShader ); + visualMap.Insert( Toolkit::VisualProperty::SHADER, customShader ); mBloomExtractImageView.SetProperty( Toolkit::ImageView::Property::IMAGE, visualMap ); // set GaussianBlurView to blur our extracted bloom @@ -388,7 +388,7 @@ void BloomView::AllocateResources() mCompositeImageView.SetImage( mRenderTargetForRenderingChildren ); // Create shader used to composite bloom and original image to output render target customShader[ Toolkit::Visual::Shader::Property::FRAGMENT_SHADER ] = COMPOSITE_FRAGMENT_SOURCE; - visualMap[ Toolkit::Visual::Property::SHADER ] = customShader; + visualMap[ Toolkit::VisualProperty::SHADER ] = customShader; mCompositeImageView.SetProperty( Toolkit::ImageView::Property::IMAGE, visualMap ); TextureSet textureSet = mCompositeImageView.GetRendererAt(0).GetTextures(); TextureSetImage( textureSet, 1u, mBlurExtractTarget );