diff options
author | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
commit | c963d75dfdeec11f82e79e727062fbf89afa2c04 (patch) | |
tree | 895633dbf641110be46f117c29890c49b3ffc0bd /libraries/evas/src/modules/engines/gl_common | |
parent | Adding the new extantz viewer and grid manager. (diff) | |
download | SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.zip SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.gz SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.bz2 SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.xz |
Update EFL to latest beta.
Diffstat (limited to '')
6 files changed, 52 insertions, 33 deletions
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@ | |||
195 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 195 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
196 | EVIL_LIBS = @EVIL_LIBS@ | 196 | EVIL_LIBS = @EVIL_LIBS@ |
197 | EXEEXT = @EXEEXT@ | 197 | EXEEXT = @EXEEXT@ |
198 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
199 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
198 | FGREP = @FGREP@ | 200 | FGREP = @FGREP@ |
199 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 201 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
200 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 202 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -245,6 +247,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
245 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 247 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
246 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 248 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
247 | PKG_CONFIG = @PKG_CONFIG@ | 249 | PKG_CONFIG = @PKG_CONFIG@ |
250 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
251 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
248 | PNG_CFLAGS = @PNG_CFLAGS@ | 252 | PNG_CFLAGS = @PNG_CFLAGS@ |
249 | PNG_LIBS = @PNG_LIBS@ | 253 | PNG_LIBS = @PNG_LIBS@ |
250 | RANLIB = @RANLIB@ | 254 | RANLIB = @RANLIB@ |
@@ -263,8 +267,6 @@ VERSION = @VERSION@ | |||
263 | VMAJ = @VMAJ@ | 267 | VMAJ = @VMAJ@ |
264 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 268 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
265 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 269 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
266 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
267 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
268 | XCB_CFLAGS = @XCB_CFLAGS@ | 270 | XCB_CFLAGS = @XCB_CFLAGS@ |
269 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 271 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
270 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 272 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -338,8 +340,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
338 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 340 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
339 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 341 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
340 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 342 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
341 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
342 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
343 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 343 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
344 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 344 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
345 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 345 | 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 | |||
17 | } | 17 | } |
18 | else | 18 | else |
19 | { | 19 | { |
20 | r = g = b = a = 255; | 20 | a = (dc->col.col >> 24) & 0xff; |
21 | r = (dc->col.col >> 16) & 0xff; | ||
22 | g = (dc->col.col >> 8 ) & 0xff; | ||
23 | b = (dc->col.col ) & 0xff; | ||
21 | } | 24 | } |
22 | 25 | ||
23 | glFlush(); | 26 | 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 @@ | |||
10 | "varying vec2 tex_c, tex_c2, tex_c3;\n" | 10 | "varying vec2 tex_c, tex_c2, tex_c3;\n" |
11 | "void main()\n" | 11 | "void main()\n" |
12 | "{\n" | 12 | "{\n" |
13 | " const mat4 yuv2rgb = mat4( 1.16400, 1.16400, 1.16400, 0.00000,\n" | 13 | " float r, g, b, y, u, v;\n" |
14 | " 0.00000, -0.34410, 1.77200, 0.00000,\n" | 14 | " y = texture2D(tex, tex_c.xy).r;\n" |
15 | " 1.40200, -0.71410, 0.00000, 0.00000,\n" | 15 | " u = texture2D(texu, tex_c2.xy).r;\n" |
16 | " -0.77380, 0.45630, -0.95880, 1.00000);\n" | 16 | " v = texture2D(texv, tex_c3.xy).r;\n" |
17 | " gl_FragColor = (yuv2rgb * vec4(texture2D(tex, tex_c.xy).r,\n" | 17 | " y = (y - 0.0625) * 1.164;\n" |
18 | " texture2D(texu, tex_c2.xy).r,\n" | 18 | " u = u - 0.5;\n" |
19 | " texture2D(texv, tex_c3.xy).r, 1.0)) * col;\n" | 19 | " v = v - 0.5;\n" |
20 | " r = y + (1.402 * v);\n" | ||
21 | " g = y - (0.34414 * u) - (0.71414 * v);\n" | ||
22 | " b = y + (1.772 * u);\n" | ||
23 | " gl_FragColor = vec4(r, g, b, 1.0) * col;\n" | ||
20 | "}\n" | 24 | "}\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; | |||
10 | varying vec2 tex_c, tex_c2, tex_c3; | 10 | varying vec2 tex_c, tex_c2, tex_c3; |
11 | void main() | 11 | void main() |
12 | { | 12 | { |
13 | const mat4 yuv2rgb = mat4( 1.16400, 1.16400, 1.16400, 0.00000, | 13 | float r, g, b, y, u, v; |
14 | 0.00000, -0.34410, 1.77200, 0.00000, | 14 | y = texture2D(tex, tex_c.xy).r; |
15 | 1.40200, -0.71410, 0.00000, 0.00000, | 15 | u = texture2D(texu, tex_c2.xy).r; |
16 | -0.77380, 0.45630, -0.95880, 1.00000); | 16 | v = texture2D(texv, tex_c3.xy).r; |
17 | gl_FragColor = (yuv2rgb * vec4(texture2D(tex, tex_c.xy).r, | 17 | y = (y - 0.0625) * 1.164; |
18 | texture2D(texu, tex_c2.xy).r, | 18 | u = u - 0.5; |
19 | texture2D(texv, tex_c3.xy).r, 1.0)) * col; | 19 | v = v - 0.5; |
20 | r = y + (1.402 * v); | ||
21 | g = y - (0.34414 * u) - (0.71414 * v); | ||
22 | b = y + (1.772 * u); | ||
23 | gl_FragColor = vec4(r, g, b, 1.0) * col; | ||
20 | } | 24 | } |
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 @@ | |||
9 | "varying vec2 tex_c, tex_c2, tex_c3;\n" | 9 | "varying vec2 tex_c, tex_c2, tex_c3;\n" |
10 | "void main()\n" | 10 | "void main()\n" |
11 | "{\n" | 11 | "{\n" |
12 | " const mat4 yuv2rgb = mat4( 1.16400, 1.16400, 1.16400, 0.00000,\n" | 12 | " float r, g, b, y, u, v;\n" |
13 | " 0.00000, -0.34410, 1.77200, 0.00000,\n" | 13 | " y = texture2D(tex, tex_c.xy).r;\n" |
14 | " 1.40200, -0.71410, 0.00000, 0.00000,\n" | 14 | " u = texture2D(texu, tex_c2.xy).r;\n" |
15 | " -0.77380, 0.45630, -0.95880, 1.00000);\n" | 15 | " v = texture2D(texv, tex_c3.xy).r;\n" |
16 | " gl_FragColor = yuv2rgb * vec4(texture2D(tex, tex_c.xy).r,\n" | 16 | " y = (y - 0.0625) * 1.164;\n" |
17 | " texture2D(texu, tex_c2.xy).r,\n" | 17 | " u = u - 0.5;\n" |
18 | " texture2D(texv, tex_c3.xy).r, 1.0);\n" | 18 | " v = v - 0.5;\n" |
19 | " r = y + (1.402 * v);\n" | ||
20 | " g = y - (0.34414 * u) - (0.71414 * v);\n" | ||
21 | " b = y + (1.772 * u);\n" | ||
22 | " gl_FragColor = vec4(r, g, b, 1.0);\n" | ||
19 | "}\n" | 23 | "}\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; | |||
9 | varying vec2 tex_c, tex_c2, tex_c3; | 9 | varying vec2 tex_c, tex_c2, tex_c3; |
10 | void main() | 10 | void main() |
11 | { | 11 | { |
12 | const mat4 yuv2rgb = mat4( 1.16400, 1.16400, 1.16400, 0.00000, | 12 | float r, g, b, y, u, v; |
13 | 0.00000, -0.34410, 1.77200, 0.00000, | 13 | y = texture2D(tex, tex_c.xy).r; |
14 | 1.40200, -0.71410, 0.00000, 0.00000, | 14 | u = texture2D(texu, tex_c2.xy).r; |
15 | -0.77380, 0.45630, -0.95880, 1.00000); | 15 | v = texture2D(texv, tex_c3.xy).r; |
16 | gl_FragColor = yuv2rgb * vec4(texture2D(tex, tex_c.xy).r, | 16 | y = (y - 0.0625) * 1.164; |
17 | texture2D(texu, tex_c2.xy).r, | 17 | u = u - 0.5; |
18 | texture2D(texv, tex_c3.xy).r, 1.0); | 18 | v = v - 0.5; |
19 | r = y + (1.402 * v); | ||
20 | g = y - (0.34414 * u) - (0.71414 * v); | ||
21 | b = y + (1.772 * u); | ||
22 | gl_FragColor = vec4(r, g, b, 1.0); | ||
19 | } | 23 | } |