From c963d75dfdeec11f82e79e727062fbf89afa2c04 Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Sun, 22 Apr 2012 09:19:23 +1000 Subject: Update EFL to latest beta. --- .../evas/src/modules/engines/gl_common/Makefile.in | 8 ++++---- .../evas/src/modules/engines/gl_common/evas_gl_line.c | 5 ++++- .../src/modules/engines/gl_common/shader/yuv_frag.h | 18 +++++++++++------- .../src/modules/engines/gl_common/shader/yuv_frag.shd | 18 +++++++++++------- .../modules/engines/gl_common/shader/yuv_nomul_frag.h | 18 +++++++++++------- .../engines/gl_common/shader/yuv_nomul_frag.shd | 18 +++++++++++------- 6 files changed, 52 insertions(+), 33 deletions(-) (limited to 'libraries/evas/src/modules/engines/gl_common') diff --git a/libraries/evas/src/modules/engines/gl_common/Makefile.in b/libraries/evas/src/modules/engines/gl_common/Makefile.in index 27284f9..5a9a1ef 100644 --- a/libraries/evas/src/modules/engines/gl_common/Makefile.in +++ b/libraries/evas/src/modules/engines/gl_common/Makefile.in @@ -195,6 +195,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ EVIL_CFLAGS = @EVIL_CFLAGS@ EVIL_LIBS = @EVIL_LIBS@ EXEEXT = @EXEEXT@ +EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ +EXOTIC_LIBS = @EXOTIC_LIBS@ FGREP = @FGREP@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ @@ -245,6 +247,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ PIXMAN_LIBS = @PIXMAN_LIBS@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PNG_CFLAGS = @PNG_CFLAGS@ PNG_LIBS = @PNG_LIBS@ RANLIB = @RANLIB@ @@ -263,8 +267,6 @@ VERSION = @VERSION@ VMAJ = @VMAJ@ WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ -WIN32_CFLAGS = @WIN32_CFLAGS@ -WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ XCB_CFLAGS = @XCB_CFLAGS@ XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ XCB_GL_LIBS = @XCB_GL_LIBS@ @@ -338,8 +340,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ -evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ -evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ diff --git a/libraries/evas/src/modules/engines/gl_common/evas_gl_line.c b/libraries/evas/src/modules/engines/gl_common/evas_gl_line.c index 48499ea..f8ace2e 100644 --- a/libraries/evas/src/modules/engines/gl_common/evas_gl_line.c +++ b/libraries/evas/src/modules/engines/gl_common/evas_gl_line.c @@ -17,7 +17,10 @@ evas_gl_common_line_draw(Evas_Engine_GL_Context *gc, int x1, int y1, int x2, int } else { - r = g = b = a = 255; + a = (dc->col.col >> 24) & 0xff; + r = (dc->col.col >> 16) & 0xff; + g = (dc->col.col >> 8 ) & 0xff; + b = (dc->col.col ) & 0xff; } glFlush(); diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag.h b/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag.h index de9acf8..87f4095 100644 --- a/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag.h +++ b/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag.h @@ -10,11 +10,15 @@ "varying vec2 tex_c, tex_c2, tex_c3;\n" "void main()\n" "{\n" -" const mat4 yuv2rgb = mat4( 1.16400, 1.16400, 1.16400, 0.00000,\n" -" 0.00000, -0.34410, 1.77200, 0.00000,\n" -" 1.40200, -0.71410, 0.00000, 0.00000,\n" -" -0.77380, 0.45630, -0.95880, 1.00000);\n" -" gl_FragColor = (yuv2rgb * vec4(texture2D(tex, tex_c.xy).r,\n" -" texture2D(texu, tex_c2.xy).r,\n" -" texture2D(texv, tex_c3.xy).r, 1.0)) * col;\n" +" float r, g, b, y, u, v;\n" +" y = texture2D(tex, tex_c.xy).r;\n" +" u = texture2D(texu, tex_c2.xy).r;\n" +" v = texture2D(texv, tex_c3.xy).r;\n" +" y = (y - 0.0625) * 1.164;\n" +" u = u - 0.5;\n" +" v = v - 0.5;\n" +" r = y + (1.402 * v);\n" +" g = y - (0.34414 * u) - (0.71414 * v);\n" +" b = y + (1.772 * u);\n" +" gl_FragColor = vec4(r, g, b, 1.0) * col;\n" "}\n" diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag.shd b/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag.shd index 8e55d14..367fb55 100644 --- a/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag.shd +++ b/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag.shd @@ -10,11 +10,15 @@ varying vec4 col; varying vec2 tex_c, tex_c2, tex_c3; void main() { - const mat4 yuv2rgb = mat4( 1.16400, 1.16400, 1.16400, 0.00000, - 0.00000, -0.34410, 1.77200, 0.00000, - 1.40200, -0.71410, 0.00000, 0.00000, - -0.77380, 0.45630, -0.95880, 1.00000); - gl_FragColor = (yuv2rgb * vec4(texture2D(tex, tex_c.xy).r, - texture2D(texu, tex_c2.xy).r, - texture2D(texv, tex_c3.xy).r, 1.0)) * col; + float r, g, b, y, u, v; + y = texture2D(tex, tex_c.xy).r; + u = texture2D(texu, tex_c2.xy).r; + v = texture2D(texv, tex_c3.xy).r; + y = (y - 0.0625) * 1.164; + u = u - 0.5; + v = v - 0.5; + r = y + (1.402 * v); + g = y - (0.34414 * u) - (0.71414 * v); + b = y + (1.772 * u); + gl_FragColor = vec4(r, g, b, 1.0) * col; } diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.h b/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.h index ee5855c..0df4b97 100644 --- a/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.h +++ b/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.h @@ -9,11 +9,15 @@ "varying vec2 tex_c, tex_c2, tex_c3;\n" "void main()\n" "{\n" -" const mat4 yuv2rgb = mat4( 1.16400, 1.16400, 1.16400, 0.00000,\n" -" 0.00000, -0.34410, 1.77200, 0.00000,\n" -" 1.40200, -0.71410, 0.00000, 0.00000,\n" -" -0.77380, 0.45630, -0.95880, 1.00000);\n" -" gl_FragColor = yuv2rgb * vec4(texture2D(tex, tex_c.xy).r,\n" -" texture2D(texu, tex_c2.xy).r,\n" -" texture2D(texv, tex_c3.xy).r, 1.0);\n" +" float r, g, b, y, u, v;\n" +" y = texture2D(tex, tex_c.xy).r;\n" +" u = texture2D(texu, tex_c2.xy).r;\n" +" v = texture2D(texv, tex_c3.xy).r;\n" +" y = (y - 0.0625) * 1.164;\n" +" u = u - 0.5;\n" +" v = v - 0.5;\n" +" r = y + (1.402 * v);\n" +" g = y - (0.34414 * u) - (0.71414 * v);\n" +" b = y + (1.772 * u);\n" +" gl_FragColor = vec4(r, g, b, 1.0);\n" "}\n" diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.shd b/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.shd index 3ec4311..ce24622 100644 --- a/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.shd +++ b/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.shd @@ -9,11 +9,15 @@ uniform sampler2D tex, texu, texv; varying vec2 tex_c, tex_c2, tex_c3; void main() { - const mat4 yuv2rgb = mat4( 1.16400, 1.16400, 1.16400, 0.00000, - 0.00000, -0.34410, 1.77200, 0.00000, - 1.40200, -0.71410, 0.00000, 0.00000, - -0.77380, 0.45630, -0.95880, 1.00000); - gl_FragColor = yuv2rgb * vec4(texture2D(tex, tex_c.xy).r, - texture2D(texu, tex_c2.xy).r, - texture2D(texv, tex_c3.xy).r, 1.0); + float r, g, b, y, u, v; + y = texture2D(tex, tex_c.xy).r; + u = texture2D(texu, tex_c2.xy).r; + v = texture2D(texv, tex_c3.xy).r; + y = (y - 0.0625) * 1.164; + u = u - 0.5; + v = v - 0.5; + r = y + (1.402 * v); + g = y - (0.34414 * u) - (0.71414 * v); + b = y + (1.772 * u); + gl_FragColor = vec4(r, g, b, 1.0); } -- cgit v1.1