From 453a02269ec66b61d23debab49fd2e7afed7d9e1 Mon Sep 17 00:00:00 2001 From: Seungho Baek Date: Wed, 25 Nov 2020 19:10:58 +0900 Subject: [PATCH 1/1] Do not change BlendMode by following whether advanced blend equation is appied or not Change-Id: I9fb5eb3c9cb52095ca032a5e2e63028d8d04d203 Signed-off-by: Seungho Baek --- dali-toolkit/internal/visuals/border/border-visual.cpp | 2 +- dali-toolkit/internal/visuals/color/color-visual.cpp | 2 +- dali-toolkit/internal/visuals/gradient/gradient-visual.cpp | 2 +- dali-toolkit/internal/visuals/visual-base-impl.cpp | 5 ----- dali-toolkit/internal/visuals/visual-base-impl.h | 7 ------- 5 files changed, 3 insertions(+), 15 deletions(-) diff --git a/dali-toolkit/internal/visuals/border/border-visual.cpp b/dali-toolkit/internal/visuals/border/border-visual.cpp index ddd2e52..452fda9 100644 --- a/dali-toolkit/internal/visuals/border/border-visual.cpp +++ b/dali-toolkit/internal/visuals/border/border-visual.cpp @@ -199,7 +199,7 @@ void BorderVisual::DoSetOnScene( Actor& actor ) InitializeRenderer(); mBorderColorIndex = mImpl->mRenderer.RegisterProperty( Toolkit::BorderVisual::Property::COLOR, COLOR_NAME, mBorderColor ); - if( ( mBorderColor.a < 1.f || mAntiAliasing ) || IsAdvancedBlendEquationApplied() ) + if( mBorderColor.a < 1.f || mAntiAliasing ) { mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON ); } diff --git a/dali-toolkit/internal/visuals/color/color-visual.cpp b/dali-toolkit/internal/visuals/color/color-visual.cpp index 793b8b2..edebccf 100644 --- a/dali-toolkit/internal/visuals/color/color-visual.cpp +++ b/dali-toolkit/internal/visuals/color/color-visual.cpp @@ -341,7 +341,7 @@ void ColorVisual::InitializeRenderer() mImpl->mRenderer.RegisterProperty( BLUR_RADIUS_NAME, mBlurRadius ); - if( mImpl->mMixColor.a < 1.f || !EqualsZero( mBlurRadius ) || IsAdvancedBlendEquationApplied() ) + if( !EqualsZero( mBlurRadius ) ) { mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON ); } diff --git a/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp b/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp index 7d39a77..d0807df 100644 --- a/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp +++ b/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp @@ -460,7 +460,7 @@ void GradientVisual::InitializeRenderer() mImpl->mRenderer.SetTextures( textureSet ); // If opaque and then no need to have blending - if( mIsOpaque && !IsAdvancedBlendEquationApplied() ) + if( mIsOpaque ) { mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::OFF ); } diff --git a/dali-toolkit/internal/visuals/visual-base-impl.cpp b/dali-toolkit/internal/visuals/visual-base-impl.cpp index ce31fb1..aca317e 100755 --- a/dali-toolkit/internal/visuals/visual-base-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-base-impl.cpp @@ -413,11 +413,6 @@ bool Visual::Base::IsPreMultipliedAlphaEnabled() const return mImpl->mFlags & Impl::IS_PREMULTIPLIED_ALPHA; } -bool Visual::Base::IsAdvancedBlendEquationApplied() const -{ - return IsPreMultipliedAlphaEnabled() && DevelRenderer::IsAdvancedBlendEquationApplied( mImpl->mRenderer ); -} - void Visual::Base::DoSetOffScene( Actor& actor ) { actor.RemoveRenderer( mImpl->mRenderer ); diff --git a/dali-toolkit/internal/visuals/visual-base-impl.h b/dali-toolkit/internal/visuals/visual-base-impl.h index b6ab75e..b925e46 100644 --- a/dali-toolkit/internal/visuals/visual-base-impl.h +++ b/dali-toolkit/internal/visuals/visual-base-impl.h @@ -170,13 +170,6 @@ public: bool IsPreMultipliedAlphaEnabled() const; /** - * @brief Query whether advanced blend equation is applied. - * - * @return True is advanced blend equation is applied, false otherwise. - */ - bool IsAdvancedBlendEquationApplied() const; - - /** * @brief Sets properties of custom shader * @param[in] propertyMap Property map containing the custom shader data */ -- 2.7.4