diff options
Diffstat (limited to 'src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x')
| -rw-r--r-- | src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x b/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x index 879548b184..628a2d190f 100644 --- a/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x +++ b/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x @@ -98,17 +98,11 @@ static const char fragment_glsl[] = "uniform float blur_div;\n" "#endif\n" "// ----------------------------------------------------------------------------\n" - "#ifndef SHD_FILTER_BLUR\n" - "void main()\n" - "{\n" - "#if defined(SHD_EXTERNAL) || defined(SHD_TEX)\n" - " vec2 coord = tex_c;\n" - "#endif\n" - "#else // SHD_FILTER_BLUR\n" "vec4 fetch_pixel(float ox, float oy)\n" "{\n" + "#if defined(SHD_EXTERNAL) || defined(SHD_TEX)\n" " vec2 coord = tex_c + vec2(ox, oy);\n" - "#endif // SHD_FILTER_BLUR\n" + "#endif\n" " vec4 c;\n" "#ifdef SHD_FILTER_DISPLACE\n" " vec2 dxy = texture2D(tex_filter, tex_c).rg * displace_vector;\n" @@ -211,8 +205,7 @@ static const char fragment_glsl[] = " texture2D(tex_filter, vec2(c.b / old_alpha, 0.0)).b * new_alpha,\n" " new_alpha);\n" "#endif\n" - "#ifndef SHD_FILTER_BLUR\n" - " gl_FragColor =\n" + " return\n" " c\n" "#ifndef SHD_NOMUL\n" " * col\n" @@ -225,9 +218,15 @@ static const char fragment_glsl[] = "#endif\n" " ;\n" "}\n" - "#else // SHD_FILTER_BLUR\n" - " return c;\n" + "#if defined(FRAGMENT_MAIN)\n" + "FRAGMENT_MAIN\n" + "#elif !defined(SHD_FILTER_BLUR)\n" + "void main()\n" + "{\n" + " gl_FragColor = fetch_pixel(0.0, 0.0);\n" "}\n" + "// ----------------------------------------------------------------------------\n" + "#else\n" "#ifndef SHD_FILTER_DIR_Y\n" "# define FETCH_PIXEL(x) fetch_pixel((x), 0.0)\n" "#else\n" |