projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Remove return; statement at fragment shader" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
graphics
/
shaders
/
color-visual-shader.frag
diff --git
a/dali-toolkit/internal/graphics/shaders/color-visual-shader.frag
b/dali-toolkit/internal/graphics/shaders/color-visual-shader.frag
index
3e3d19d
..
33202a2
100644
(file)
--- a/
dali-toolkit/internal/graphics/shaders/color-visual-shader.frag
+++ b/
dali-toolkit/internal/graphics/shaders/color-visual-shader.frag
@@
-273,21
+273,26
@@
void main()
if(abs(vPosition.x) < vOptRectSize.x && abs(vPosition.y) < vOptRectSize.y)
{
OUT_COLOR = targetColor;
if(abs(vPosition.x) < vOptRectSize.x && abs(vPosition.y) < vOptRectSize.y)
{
OUT_COLOR = targetColor;
- return;
}
}
- PreprocessPotential();
+ else
+ {
+ PreprocessPotential();
#endif
#if !IS_REQUIRED_BLUR && IS_REQUIRED_BORDERLINE
#endif
#if !IS_REQUIRED_BLUR && IS_REQUIRED_BORDERLINE
- targetColor = convertBorderlineColor(targetColor);
+
targetColor = convertBorderlineColor(targetColor);
#endif
#endif
- OUT_COLOR = targetColor;
+
OUT_COLOR = targetColor;
#if IS_REQUIRED_BLUR
#if IS_REQUIRED_BLUR
- mediump float opacity = calculateBlurOpacity();
- OUT_COLOR.a *= opacity;
+
mediump float opacity = calculateBlurOpacity();
+
OUT_COLOR.a *= opacity;
#elif IS_REQUIRED_ROUNDED_CORNER
#elif IS_REQUIRED_ROUNDED_CORNER
- mediump float opacity = calculateCornerOpacity();
- OUT_COLOR.a *= opacity;
+ mediump float opacity = calculateCornerOpacity();
+ OUT_COLOR.a *= opacity;
+#endif
+
+#if IS_REQUIRED_BLUR || IS_REQUIRED_ROUNDED_CORNER || IS_REQUIRED_BORDERLINE
+ }
#endif
}
#endif
}