From 6d07023ac2c1eb74655453fd1abfa6c9c1b50d9d Mon Sep 17 00:00:00 2001 From: jmm Date: Tue, 25 Jun 2024 10:15:06 +0900 Subject: [PATCH] Revert changes at gaussian-blur-view.frag Change-Id: I1f0556d3a25053b970103ffacbeaa3e1a6696987 --- .../internal/controls/render-effects/blur-effect-impl.cpp | 2 +- dali-toolkit/internal/graphics/shaders/blur-effect.frag | 15 +++++++++++++++ .../internal/graphics/shaders/gaussian-blur-view.frag | 12 ++++++------ 3 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 dali-toolkit/internal/graphics/shaders/blur-effect.frag diff --git a/dali-toolkit/internal/controls/render-effects/blur-effect-impl.cpp b/dali-toolkit/internal/controls/render-effects/blur-effect-impl.cpp index fd1dbf8..243e0c3 100644 --- a/dali-toolkit/internal/controls/render-effects/blur-effect-impl.cpp +++ b/dali-toolkit/internal/controls/render-effects/blur-effect-impl.cpp @@ -122,7 +122,7 @@ void BlurEffectImpl::Initialize() std::ostringstream fragmentStringStream; fragmentStringStream << "#define NUM_SAMPLES " << mPixelRadius << "\n"; - fragmentStringStream << SHADER_GAUSSIAN_BLUR_VIEW_FRAG; + fragmentStringStream << SHADER_BLUR_EFFECT_FRAG; std::string fragmentSource(fragmentStringStream.str()); ////////////////////////////////////////////////////// diff --git a/dali-toolkit/internal/graphics/shaders/blur-effect.frag b/dali-toolkit/internal/graphics/shaders/blur-effect.frag new file mode 100644 index 0000000..626d27b --- /dev/null +++ b/dali-toolkit/internal/graphics/shaders/blur-effect.frag @@ -0,0 +1,15 @@ +varying highp vec2 vTexCoord; +uniform sampler2D sTexture; +uniform lowp vec4 uColor; +uniform highp vec2 uSampleOffsets[NUM_SAMPLES]; +uniform highp float uSampleWeights[NUM_SAMPLES]; + +void main() +{ + highp vec4 col = vec4(0.0); + for (int i=0; i