X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbloom-view%2Fbloom-view-impl.cpp;h=ab3a9c9050c0691dd51c24914e7e6a69910aeb5e;hp=474a16e2fb4270f5d0bd9f85d5c4b54ede5d4905;hb=a2de9cf491172cd5da9dc9ed60b17683dab6d7bc;hpb=a9e64686388c10743bf66a9c5d6e0aa06e198c70 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 474a16e..ab3a9c9 100644 --- a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp +++ b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp @@ -83,8 +83,6 @@ const char* const BLOOM_SATURATION_PROPERTY_NAME = "uBloomSaturation"; const char* const IMAGE_INTENSITY_PROPERTY_NAME = "uImageIntensity"; const char* const IMAGE_SATURATION_PROPERTY_NAME = "uImageSaturation"; -const char* const EFFECT_IMAGE_NAME( "sEffect" ); - /////////////////////////////////////////////////////// // // Bloom shaders @@ -393,16 +391,8 @@ void BloomView::AllocateResources() // use the completed blur in the first buffer and composite with the original child actors render mCompositeImageActor.SetImage( mRenderTargetForRenderingChildren ); - Material material = mCompositeImageActor.GetRendererAt(0).GetMaterial(); - int textureIndex = material.GetTextureIndex( EFFECT_IMAGE_NAME ); - if( textureIndex == -1 ) - { - material.AddTexture( mBlurExtractTarget, EFFECT_IMAGE_NAME ); - } - else - { - material.SetTextureImage( textureIndex, mBlurExtractTarget ); - } + TextureSet textureSet = mCompositeImageActor.GetRendererAt(0).GetTextures(); + textureSet.SetImage( 1u, mBlurExtractTarget ); // set up target actor for rendering result, i.e. the blurred image mTargetImageActor.SetImage(mOutputRenderTarget);