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/lib/include | |
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 '')
-rw-r--r-- | libraries/evas/src/lib/include/Makefile.in | 8 | ||||
-rw-r--r-- | libraries/evas/src/lib/include/evas_blend_ops.h | 12 | ||||
-rw-r--r-- | libraries/evas/src/lib/include/evas_common.h | 92 | ||||
-rw-r--r-- | libraries/evas/src/lib/include/evas_private.h | 3 |
4 files changed, 66 insertions, 49 deletions
diff --git a/libraries/evas/src/lib/include/Makefile.in b/libraries/evas/src/lib/include/Makefile.in index 21f0099..8060178 100644 --- a/libraries/evas/src/lib/include/Makefile.in +++ b/libraries/evas/src/lib/include/Makefile.in | |||
@@ -116,6 +116,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
116 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 116 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
117 | EVIL_LIBS = @EVIL_LIBS@ | 117 | EVIL_LIBS = @EVIL_LIBS@ |
118 | EXEEXT = @EXEEXT@ | 118 | EXEEXT = @EXEEXT@ |
119 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
120 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
119 | FGREP = @FGREP@ | 121 | FGREP = @FGREP@ |
120 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 122 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
121 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 123 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -166,6 +168,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
166 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 168 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
167 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 169 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
168 | PKG_CONFIG = @PKG_CONFIG@ | 170 | PKG_CONFIG = @PKG_CONFIG@ |
171 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
172 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
169 | PNG_CFLAGS = @PNG_CFLAGS@ | 173 | PNG_CFLAGS = @PNG_CFLAGS@ |
170 | PNG_LIBS = @PNG_LIBS@ | 174 | PNG_LIBS = @PNG_LIBS@ |
171 | RANLIB = @RANLIB@ | 175 | RANLIB = @RANLIB@ |
@@ -184,8 +188,6 @@ VERSION = @VERSION@ | |||
184 | VMAJ = @VMAJ@ | 188 | VMAJ = @VMAJ@ |
185 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 189 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
186 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 190 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
187 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
188 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
189 | XCB_CFLAGS = @XCB_CFLAGS@ | 191 | XCB_CFLAGS = @XCB_CFLAGS@ |
190 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 192 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
191 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 193 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -259,8 +261,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
259 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 261 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
260 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 262 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
261 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 263 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
262 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
263 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
264 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 264 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
265 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 265 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
266 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 266 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
diff --git a/libraries/evas/src/lib/include/evas_blend_ops.h b/libraries/evas/src/lib/include/evas_blend_ops.h index 1ada384..6bd1f16 100644 --- a/libraries/evas/src/lib/include/evas_blend_ops.h +++ b/libraries/evas/src/lib/include/evas_blend_ops.h | |||
@@ -200,7 +200,7 @@ static __m128i RGB_MASK_SSE3; | |||
200 | 200 | ||
201 | static __m128i ALPHA_SSE3; | 201 | static __m128i ALPHA_SSE3; |
202 | 202 | ||
203 | EFL_ALWAYS_INLINE __m128i | 203 | static EFL_ALWAYS_INLINE __m128i |
204 | mul_256_sse3(__m128i a, __m128i c) { | 204 | mul_256_sse3(__m128i a, __m128i c) { |
205 | 205 | ||
206 | /* prepare alpha for word multiplication */ | 206 | /* prepare alpha for word multiplication */ |
@@ -228,7 +228,7 @@ mul_256_sse3(__m128i a, __m128i c) { | |||
228 | return _mm_add_epi32(c0, c1); | 228 | return _mm_add_epi32(c0, c1); |
229 | } | 229 | } |
230 | 230 | ||
231 | EFL_ALWAYS_INLINE __m128i | 231 | static EFL_ALWAYS_INLINE __m128i |
232 | sub4_alpha_sse3(__m128i c) { | 232 | sub4_alpha_sse3(__m128i c) { |
233 | 233 | ||
234 | __m128i c0 = c; | 234 | __m128i c0 = c; |
@@ -237,7 +237,7 @@ sub4_alpha_sse3(__m128i c) { | |||
237 | return _mm_sub_epi32(ALPHA_SSE3, c0); | 237 | return _mm_sub_epi32(ALPHA_SSE3, c0); |
238 | } | 238 | } |
239 | 239 | ||
240 | EFL_ALWAYS_INLINE __m128i | 240 | static EFL_ALWAYS_INLINE __m128i |
241 | interp4_256_sse3(__m128i a, __m128i c0, __m128i c1) | 241 | interp4_256_sse3(__m128i a, __m128i c0, __m128i c1) |
242 | { | 242 | { |
243 | const __m128i zero = _mm_setzero_si128(); | 243 | const __m128i zero = _mm_setzero_si128(); |
@@ -289,7 +289,7 @@ interp4_256_sse3(__m128i a, __m128i c0, __m128i c1) | |||
289 | return (__m128i) _mm_shuffle_ps( (__m128)cl_sub, (__m128)ch_sub, 0x44); | 289 | return (__m128i) _mm_shuffle_ps( (__m128)cl_sub, (__m128)ch_sub, 0x44); |
290 | } | 290 | } |
291 | 291 | ||
292 | EFL_ALWAYS_INLINE __m128i | 292 | static EFL_ALWAYS_INLINE __m128i |
293 | mul_sym_sse3(__m128i a, __m128i c) { | 293 | mul_sym_sse3(__m128i a, __m128i c) { |
294 | 294 | ||
295 | /* Prepare alpha for word mult */ | 295 | /* Prepare alpha for word mult */ |
@@ -318,7 +318,7 @@ mul_sym_sse3(__m128i a, __m128i c) { | |||
318 | return _mm_add_epi32(c0, c1); | 318 | return _mm_add_epi32(c0, c1); |
319 | } | 319 | } |
320 | 320 | ||
321 | EFL_ALWAYS_INLINE __m128i | 321 | static EFL_ALWAYS_INLINE __m128i |
322 | mul4_sym_sse3(__m128i x, __m128i y) { | 322 | mul4_sym_sse3(__m128i x, __m128i y) { |
323 | 323 | ||
324 | const __m128i zero = _mm_setzero_si128(); | 324 | const __m128i zero = _mm_setzero_si128(); |
@@ -341,7 +341,7 @@ mul4_sym_sse3(__m128i x, __m128i y) { | |||
341 | return _mm_packus_epi16(r_l, r_h); | 341 | return _mm_packus_epi16(r_l, r_h); |
342 | } | 342 | } |
343 | 343 | ||
344 | EFL_ALWAYS_INLINE __m128i | 344 | static EFL_ALWAYS_INLINE __m128i |
345 | mul3_sym_sse3(__m128i x, __m128i y) { | 345 | mul3_sym_sse3(__m128i x, __m128i y) { |
346 | 346 | ||
347 | __m128i res = mul4_sym_sse3(x, y); | 347 | __m128i res = mul4_sym_sse3(x, y); |
diff --git a/libraries/evas/src/lib/include/evas_common.h b/libraries/evas/src/lib/include/evas_common.h index a9063e6..e853064 100644 --- a/libraries/evas/src/lib/include/evas_common.h +++ b/libraries/evas/src/lib/include/evas_common.h | |||
@@ -5,6 +5,45 @@ | |||
5 | #include "config.h" /* so that EAPI in Evas.h is correctly defined */ | 5 | #include "config.h" /* so that EAPI in Evas.h is correctly defined */ |
6 | //#endif | 6 | //#endif |
7 | 7 | ||
8 | #ifdef STDC_HEADERS | ||
9 | # include <stdlib.h> | ||
10 | # include <stddef.h> | ||
11 | #else | ||
12 | # ifdef HAVE_STDLIB_H | ||
13 | # include <stdlib.h> | ||
14 | # endif | ||
15 | #endif | ||
16 | #ifdef HAVE_ALLOCA_H | ||
17 | # include <alloca.h> | ||
18 | #elif !defined alloca | ||
19 | # ifdef __GNUC__ | ||
20 | # define alloca __builtin_alloca | ||
21 | # elif defined _AIX | ||
22 | # define alloca __alloca | ||
23 | # elif defined _MSC_VER | ||
24 | # include <malloc.h> | ||
25 | # define alloca _alloca | ||
26 | # elif !defined HAVE_ALLOCA | ||
27 | # ifdef __cplusplus | ||
28 | extern "C" | ||
29 | # endif | ||
30 | void *alloca (size_t); | ||
31 | # endif | ||
32 | #endif | ||
33 | |||
34 | #include <stdio.h> | ||
35 | #include <stdlib.h> | ||
36 | #include <string.h> | ||
37 | #include <sys/types.h> | ||
38 | #include <sys/stat.h> | ||
39 | #include <time.h> | ||
40 | #include <ctype.h> | ||
41 | |||
42 | #ifndef _MSC_VER | ||
43 | # include <stdint.h> | ||
44 | #include <unistd.h> | ||
45 | #endif | ||
46 | |||
8 | #ifdef HAVE_EVIL | 47 | #ifdef HAVE_EVIL |
9 | # include <Evil.h> | 48 | # include <Evil.h> |
10 | #endif | 49 | #endif |
@@ -13,10 +52,6 @@ | |||
13 | # include <Escape.h> | 52 | # include <Escape.h> |
14 | #endif | 53 | #endif |
15 | 54 | ||
16 | #include <Eina.h> | ||
17 | #include "Evas.h" | ||
18 | //#include "Evas_GL.h" | ||
19 | |||
20 | #ifdef HAVE_PIXMAN | 55 | #ifdef HAVE_PIXMAN |
21 | #include <pixman.h> | 56 | #include <pixman.h> |
22 | #endif | 57 | #endif |
@@ -25,6 +60,14 @@ | |||
25 | #include <sys/stat.h> | 60 | #include <sys/stat.h> |
26 | #include <unistd.h> | 61 | #include <unistd.h> |
27 | 62 | ||
63 | #ifdef HAVE_EXOTIC | ||
64 | # include <Exotic.h> | ||
65 | #endif | ||
66 | |||
67 | #include <Eina.h> | ||
68 | #include "Evas.h" | ||
69 | //#include "Evas_GL.h" | ||
70 | |||
28 | #ifndef HAVE_LROUND | 71 | #ifndef HAVE_LROUND |
29 | /* right now i dont care about rendering bugs on platforms without lround | 72 | /* right now i dont care about rendering bugs on platforms without lround |
30 | (e.g. windows/vc++... yay!) | 73 | (e.g. windows/vc++... yay!) |
@@ -171,35 +214,6 @@ extern EAPI int _evas_log_dom_global; | |||
171 | 214 | ||
172 | #endif | 215 | #endif |
173 | 216 | ||
174 | #ifdef HAVE_ALLOCA_H | ||
175 | # include <alloca.h> | ||
176 | #elif defined __GNUC__ | ||
177 | # define alloca __builtin_alloca | ||
178 | #elif defined _AIX | ||
179 | # define alloca __alloca | ||
180 | #elif defined _MSC_VER | ||
181 | # include <malloc.h> | ||
182 | # define alloca _alloca | ||
183 | #else | ||
184 | # include <stddef.h> | ||
185 | # ifdef __cplusplus | ||
186 | extern "C" | ||
187 | # endif | ||
188 | void *alloca (size_t); | ||
189 | #endif | ||
190 | |||
191 | #include <stdio.h> | ||
192 | #include <stdlib.h> | ||
193 | #include <string.h> | ||
194 | #include <sys/types.h> | ||
195 | #include <sys/stat.h> | ||
196 | #include <time.h> | ||
197 | #include <ctype.h> | ||
198 | |||
199 | #ifndef _MSC_VER | ||
200 | # include <stdint.h> | ||
201 | #endif | ||
202 | |||
203 | #include <ft2build.h> | 217 | #include <ft2build.h> |
204 | #include FT_FREETYPE_H | 218 | #include FT_FREETYPE_H |
205 | #include FT_GLYPH_H | 219 | #include FT_GLYPH_H |
@@ -1005,12 +1019,12 @@ struct list | |||
1005 | 1019 | ||
1006 | struct rect | 1020 | struct rect |
1007 | { | 1021 | { |
1008 | short left; | 1022 | int left; |
1009 | short top; | 1023 | int top; |
1010 | short right; | 1024 | int right; |
1011 | short bottom; | 1025 | int bottom; |
1012 | short width; | 1026 | int width; |
1013 | short height; | 1027 | int height; |
1014 | int area; | 1028 | int area; |
1015 | }; | 1029 | }; |
1016 | 1030 | ||
diff --git a/libraries/evas/src/lib/include/evas_private.h b/libraries/evas/src/lib/include/evas_private.h index 84c1d36..bf0cfc5 100644 --- a/libraries/evas/src/lib/include/evas_private.h +++ b/libraries/evas/src/lib/include/evas_private.h | |||
@@ -615,6 +615,8 @@ struct _Evas_Object | |||
615 | Eina_Bool changed_move : 1; | 615 | Eina_Bool changed_move : 1; |
616 | Eina_Bool changed_move_only : 1; | 616 | Eina_Bool changed_move_only : 1; |
617 | Eina_Bool changed_nomove : 1; | 617 | Eina_Bool changed_nomove : 1; |
618 | Eina_Bool changed_map : 1; | ||
619 | Eina_Bool changed_pchange : 1; | ||
618 | Eina_Bool del_ref : 1; | 620 | Eina_Bool del_ref : 1; |
619 | 621 | ||
620 | Eina_Bool is_frame : 1; | 622 | Eina_Bool is_frame : 1; |
@@ -850,6 +852,7 @@ struct _Evas_Func | |||
850 | void *(*gl_proc_address_get) (void *data, const char *name); | 852 | void *(*gl_proc_address_get) (void *data, const char *name); |
851 | int (*gl_native_surface_get) (void *data, void *surface, void *native_surface); | 853 | int (*gl_native_surface_get) (void *data, void *surface, void *native_surface); |
852 | void *(*gl_api_get) (void *data); | 854 | void *(*gl_api_get) (void *data); |
855 | void (*gl_img_obj_set) (void *data, void *image, int has_alpha); | ||
853 | 856 | ||
854 | int (*image_load_error_get) (void *data, void *image); | 857 | int (*image_load_error_get) (void *data, void *image); |
855 | int (*font_run_end_get) (void *data, Evas_Font_Set *font, Evas_Font_Instance **script_fi, Evas_Font_Instance **cur_fi, Evas_Script_Type script, const Eina_Unicode *text, int run_len); | 858 | int (*font_run_end_get) (void *data, Evas_Font_Set *font, Evas_Font_Instance **script_fi, Evas_Font_Instance **cur_fi, Evas_Script_Type script, const Eina_Unicode *text, int run_len); |