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/engines | |
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 '')
21 files changed, 265 insertions, 105 deletions
diff --git a/libraries/evas/src/lib/engines/Makefile.in b/libraries/evas/src/lib/engines/Makefile.in index 4c3c1da..b5cf292 100644 --- a/libraries/evas/src/lib/engines/Makefile.in +++ b/libraries/evas/src/lib/engines/Makefile.in | |||
@@ -158,6 +158,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
158 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 158 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
159 | EVIL_LIBS = @EVIL_LIBS@ | 159 | EVIL_LIBS = @EVIL_LIBS@ |
160 | EXEEXT = @EXEEXT@ | 160 | EXEEXT = @EXEEXT@ |
161 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
162 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
161 | FGREP = @FGREP@ | 163 | FGREP = @FGREP@ |
162 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 164 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
163 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 165 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -208,6 +210,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
208 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 210 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
209 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 211 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
210 | PKG_CONFIG = @PKG_CONFIG@ | 212 | PKG_CONFIG = @PKG_CONFIG@ |
213 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
214 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
211 | PNG_CFLAGS = @PNG_CFLAGS@ | 215 | PNG_CFLAGS = @PNG_CFLAGS@ |
212 | PNG_LIBS = @PNG_LIBS@ | 216 | PNG_LIBS = @PNG_LIBS@ |
213 | RANLIB = @RANLIB@ | 217 | RANLIB = @RANLIB@ |
@@ -226,8 +230,6 @@ VERSION = @VERSION@ | |||
226 | VMAJ = @VMAJ@ | 230 | VMAJ = @VMAJ@ |
227 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 231 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
228 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 232 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
229 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
230 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
231 | XCB_CFLAGS = @XCB_CFLAGS@ | 233 | XCB_CFLAGS = @XCB_CFLAGS@ |
232 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 234 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
233 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 235 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -301,8 +303,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
301 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 303 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
302 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 304 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
303 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 305 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
304 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
305 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
306 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 306 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
307 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 307 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
308 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 308 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
diff --git a/libraries/evas/src/lib/engines/common/Makefile.am b/libraries/evas/src/lib/engines/common/Makefile.am index 9c9918d..0937394 100644 --- a/libraries/evas/src/lib/engines/common/Makefile.am +++ b/libraries/evas/src/lib/engines/common/Makefile.am | |||
@@ -13,7 +13,7 @@ AM_CPPFLAGS = -I. \ | |||
13 | @FREETYPE_CFLAGS@ @VALGRIND_CFLAGS@ \ | 13 | @FREETYPE_CFLAGS@ @VALGRIND_CFLAGS@ \ |
14 | @PIXMAN_CFLAGS@ \ | 14 | @PIXMAN_CFLAGS@ \ |
15 | @EET_CFLAGS@ @pthread_cflags@ \ | 15 | @EET_CFLAGS@ @pthread_cflags@ \ |
16 | @WIN32_CFLAGS@ @EINA_CFLAGS@ \ | 16 | @EINA_CFLAGS@ \ |
17 | @FRIBIDI_CFLAGS@ @HARFBUZZ_CFLAGS@ \ | 17 | @FRIBIDI_CFLAGS@ @HARFBUZZ_CFLAGS@ \ |
18 | @PIXMAN_CFLAGS@ | 18 | @PIXMAN_CFLAGS@ |
19 | 19 | ||
diff --git a/libraries/evas/src/lib/engines/common/Makefile.in b/libraries/evas/src/lib/engines/common/Makefile.in index 7d1f20a..08526cd 100644 --- a/libraries/evas/src/lib/engines/common/Makefile.in +++ b/libraries/evas/src/lib/engines/common/Makefile.in | |||
@@ -202,6 +202,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
202 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 202 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
203 | EVIL_LIBS = @EVIL_LIBS@ | 203 | EVIL_LIBS = @EVIL_LIBS@ |
204 | EXEEXT = @EXEEXT@ | 204 | EXEEXT = @EXEEXT@ |
205 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
206 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
205 | FGREP = @FGREP@ | 207 | FGREP = @FGREP@ |
206 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 208 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
207 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 209 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -252,6 +254,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
252 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 254 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
253 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 255 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
254 | PKG_CONFIG = @PKG_CONFIG@ | 256 | PKG_CONFIG = @PKG_CONFIG@ |
257 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
258 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
255 | PNG_CFLAGS = @PNG_CFLAGS@ | 259 | PNG_CFLAGS = @PNG_CFLAGS@ |
256 | PNG_LIBS = @PNG_LIBS@ | 260 | PNG_LIBS = @PNG_LIBS@ |
257 | RANLIB = @RANLIB@ | 261 | RANLIB = @RANLIB@ |
@@ -270,8 +274,6 @@ VERSION = @VERSION@ | |||
270 | VMAJ = @VMAJ@ | 274 | VMAJ = @VMAJ@ |
271 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 275 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
272 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 276 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
273 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
274 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
275 | XCB_CFLAGS = @XCB_CFLAGS@ | 277 | XCB_CFLAGS = @XCB_CFLAGS@ |
276 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 278 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
277 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 279 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -345,8 +347,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
345 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 347 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
346 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 348 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
347 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 349 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
348 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
349 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
350 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 350 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
351 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 351 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
352 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 352 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -441,7 +441,7 @@ AM_CPPFLAGS = -I. \ | |||
441 | @FREETYPE_CFLAGS@ @VALGRIND_CFLAGS@ \ | 441 | @FREETYPE_CFLAGS@ @VALGRIND_CFLAGS@ \ |
442 | @PIXMAN_CFLAGS@ \ | 442 | @PIXMAN_CFLAGS@ \ |
443 | @EET_CFLAGS@ @pthread_cflags@ \ | 443 | @EET_CFLAGS@ @pthread_cflags@ \ |
444 | @WIN32_CFLAGS@ @EINA_CFLAGS@ \ | 444 | @EINA_CFLAGS@ \ |
445 | @FRIBIDI_CFLAGS@ @HARFBUZZ_CFLAGS@ \ | 445 | @FRIBIDI_CFLAGS@ @HARFBUZZ_CFLAGS@ \ |
446 | @PIXMAN_CFLAGS@ | 446 | @PIXMAN_CFLAGS@ |
447 | 447 | ||
diff --git a/libraries/evas/src/lib/engines/common/evas_draw_main.c b/libraries/evas/src/lib/engines/common/evas_draw_main.c index def19a8..d08e788 100644 --- a/libraries/evas/src/lib/engines/common/evas_draw_main.c +++ b/libraries/evas/src/lib/engines/common/evas_draw_main.c | |||
@@ -559,7 +559,7 @@ evas_common_draw_context_cutout_split(Cutout_Rects* res, int idx, Cutout_Rect *s | |||
559 | EAPI Cutout_Rects* | 559 | EAPI Cutout_Rects* |
560 | evas_common_draw_context_apply_cutouts(RGBA_Draw_Context *dc) | 560 | evas_common_draw_context_apply_cutouts(RGBA_Draw_Context *dc) |
561 | { | 561 | { |
562 | Cutout_Rects* res; | 562 | Cutout_Rects* res, *res2; |
563 | int i; | 563 | int i; |
564 | int j; | 564 | int j; |
565 | 565 | ||
@@ -583,6 +583,69 @@ evas_common_draw_context_apply_cutouts(RGBA_Draw_Context *dc) | |||
583 | active--; | 583 | active--; |
584 | } | 584 | } |
585 | } | 585 | } |
586 | /* merge rects */ | ||
587 | #define RI res->rects[i] | ||
588 | #define RJ res->rects[j] | ||
589 | if (res->active > 1) | ||
590 | { | ||
591 | int found = 1; | ||
592 | |||
593 | while (found) | ||
594 | { | ||
595 | found = 0; | ||
596 | for (i = 0; i < res->active; i++) | ||
597 | { | ||
598 | for (j = i + 1; j < res->active; j++) | ||
599 | { | ||
600 | /* skip empty rects we are removing */ | ||
601 | if (RJ.w == 0) continue; | ||
602 | /* check if its same width, immediately above or below */ | ||
603 | if ((RJ.w == RI.w) && (RJ.x == RI.x)) | ||
604 | { | ||
605 | if ((RJ.y + RJ.h) == RI.y) /* above */ | ||
606 | { | ||
607 | RI.y = RJ.y; | ||
608 | RI.h += RJ.h; | ||
609 | RJ.w = 0; | ||
610 | found = 1; | ||
611 | } | ||
612 | else if ((RI.y + RI.h) == RJ.y) /* below */ | ||
613 | { | ||
614 | RI.h += RJ.h; | ||
615 | RJ.w = 0; | ||
616 | found = 1; | ||
617 | } | ||
618 | } | ||
619 | /* check if its same height, immediately left or right */ | ||
620 | else if ((RJ.h == RI.h) && (RJ.y == RI.y)) | ||
621 | { | ||
622 | if ((RJ.x + RJ.w) == RI.x) /* left */ | ||
623 | { | ||
624 | RI.x = RJ.x; | ||
625 | RI.w += RJ.w; | ||
626 | RJ.w = 0; | ||
627 | found = 1; | ||
628 | } | ||
629 | else if ((RI.x + RI.w) == RJ.x) /* right */ | ||
630 | { | ||
631 | RI.w += RJ.w; | ||
632 | RJ.w = 0; | ||
633 | found = 1; | ||
634 | } | ||
635 | } | ||
636 | } | ||
637 | } | ||
638 | } | ||
639 | res2 = evas_common_draw_context_cutouts_new(); | ||
640 | for (i = 0; i < res->active; i++) | ||
641 | { | ||
642 | if (RI.w == 0) continue; | ||
643 | evas_common_draw_context_cutouts_add(res2, RI.x, RI.y, RI.w, RI.h); | ||
644 | } | ||
645 | free(res->rects); | ||
646 | free(res); | ||
647 | return res2; | ||
648 | } | ||
586 | return res; | 649 | return res; |
587 | } | 650 | } |
588 | 651 | ||
diff --git a/libraries/evas/src/lib/engines/common/evas_font_load.c b/libraries/evas/src/lib/engines/common/evas_font_load.c index 3fc4521..abba9e3 100644 --- a/libraries/evas/src/lib/engines/common/evas_font_load.c +++ b/libraries/evas/src/lib/engines/common/evas_font_load.c | |||
@@ -71,9 +71,7 @@ _evas_common_font_int_free(RGBA_Font_Int *fi) | |||
71 | _evas_common_font_int_clear(fi); | 71 | _evas_common_font_int_clear(fi); |
72 | eina_hash_free(fi->kerning); | 72 | eina_hash_free(fi->kerning); |
73 | 73 | ||
74 | #ifdef HAVE_PTHREAD | 74 | LKD(fi->ft_mutex); |
75 | pthread_mutex_destroy(&fi->ft_mutex); | ||
76 | #endif | ||
77 | #ifdef USE_HARFBUZZ | 75 | #ifdef USE_HARFBUZZ |
78 | hb_font_destroy(fi->ft.hb_font); | 76 | hb_font_destroy(fi->ft.hb_font); |
79 | #endif | 77 | #endif |
@@ -301,9 +299,7 @@ _evas_common_font_int_cache_init(RGBA_Font_Int *fi) | |||
301 | EINA_KEY_CMP(_evas_common_font_double_int_cmp), | 299 | EINA_KEY_CMP(_evas_common_font_double_int_cmp), |
302 | EINA_KEY_HASH(_evas_common_font_double_int_hash), | 300 | EINA_KEY_HASH(_evas_common_font_double_int_hash), |
303 | free, 3); | 301 | free, 3); |
304 | #ifdef HAVE_PTHREAD | 302 | LKI(fi->ft_mutex); |
305 | pthread_mutex_init(&fi->ft_mutex, NULL); | ||
306 | #endif | ||
307 | } | 303 | } |
308 | 304 | ||
309 | EAPI RGBA_Font_Int * | 305 | EAPI RGBA_Font_Int * |
diff --git a/libraries/evas/src/lib/engines/common/evas_image_main.c b/libraries/evas/src/lib/engines/common/evas_image_main.c index d2f8c0b..9c233b3 100644 --- a/libraries/evas/src/lib/engines/common/evas_image_main.c +++ b/libraries/evas/src/lib/engines/common/evas_image_main.c | |||
@@ -16,6 +16,8 @@ | |||
16 | # include <memcheck.h> | 16 | # include <memcheck.h> |
17 | #endif | 17 | #endif |
18 | 18 | ||
19 | //#define SURFDBG 1 | ||
20 | |||
19 | static Evas_Cache_Image * eci = NULL; | 21 | static Evas_Cache_Image * eci = NULL; |
20 | static int reference = 0; | 22 | static int reference = 0; |
21 | 23 | ||
@@ -212,6 +214,30 @@ evas_common_rgba_image_free(Image_Entry *ie) | |||
212 | _evas_common_rgba_image_delete(ie); | 214 | _evas_common_rgba_image_delete(ie); |
213 | } | 215 | } |
214 | 216 | ||
217 | #ifdef SURFDBG | ||
218 | static Eina_List *surfs = NULL; | ||
219 | |||
220 | static void | ||
221 | surf_debug(void) | ||
222 | { | ||
223 | Eina_List *l; | ||
224 | Image_Entry *ie; | ||
225 | RGBA_Image *im; | ||
226 | int i = 0; | ||
227 | |||
228 | printf("----SURFS----\n"); | ||
229 | EINA_LIST_FOREACH(surfs, l, ie) | ||
230 | { | ||
231 | im = ie; | ||
232 | printf("%i - %p - %ix%i [%s][%s]\n", | ||
233 | i, im->image.data, ie->allocated.w, ie->allocated.h, | ||
234 | ie->file, ie->key | ||
235 | ); | ||
236 | i++; | ||
237 | } | ||
238 | } | ||
239 | #endif | ||
240 | |||
215 | EAPI void | 241 | EAPI void |
216 | evas_common_rgba_image_unload(Image_Entry *ie) | 242 | evas_common_rgba_image_unload(Image_Entry *ie) |
217 | { | 243 | { |
@@ -252,7 +278,12 @@ evas_common_rgba_image_unload(Image_Entry *ie) | |||
252 | #endif | 278 | #endif |
253 | 279 | ||
254 | if (im->image.data && !im->image.no_free) | 280 | if (im->image.data && !im->image.no_free) |
255 | free(im->image.data); | 281 | { |
282 | free(im->image.data); | ||
283 | #ifdef SURFDBG | ||
284 | surfs = eina_list_remove(surfs, ie); | ||
285 | #endif | ||
286 | } | ||
256 | im->image.data = NULL; | 287 | im->image.data = NULL; |
257 | ie->allocated.w = 0; | 288 | ie->allocated.w = 0; |
258 | ie->allocated.h = 0; | 289 | ie->allocated.h = 0; |
@@ -260,6 +291,9 @@ evas_common_rgba_image_unload(Image_Entry *ie) | |||
260 | #ifdef BUILD_ASYNC_PRELOAD | 291 | #ifdef BUILD_ASYNC_PRELOAD |
261 | ie->flags.preload_done = 0; | 292 | ie->flags.preload_done = 0; |
262 | #endif | 293 | #endif |
294 | #ifdef SURFDBG | ||
295 | surf_debug(); | ||
296 | #endif | ||
263 | } | 297 | } |
264 | 298 | ||
265 | void | 299 | void |
@@ -318,10 +352,20 @@ _evas_common_rgba_image_surface_alloc(Image_Entry *ie, unsigned int w, unsigned | |||
318 | else | 352 | else |
319 | siz = w * h * sizeof(DATA32); | 353 | siz = w * h * sizeof(DATA32); |
320 | 354 | ||
321 | if (im->image.data) free(im->image.data); | 355 | if (im->image.data) |
356 | { | ||
357 | free(im->image.data); | ||
358 | #ifdef SURFDBG | ||
359 | surfs = eina_list_remove(surfs, ie); | ||
360 | #endif | ||
361 | } | ||
322 | im->image.data = malloc(siz); | 362 | im->image.data = malloc(siz); |
323 | if (!im->image.data) return -1; | 363 | if (!im->image.data) return -1; |
324 | 364 | ie->allocated.w = w; | |
365 | ie->allocated.h = h; | ||
366 | #ifdef SURFDBG | ||
367 | surfs = eina_list_append(surfs, ie); | ||
368 | #endif | ||
325 | #ifdef HAVE_VALGRIND | 369 | #ifdef HAVE_VALGRIND |
326 | # ifdef VALGRIND_MAKE_READABLE | 370 | # ifdef VALGRIND_MAKE_READABLE |
327 | VALGRIND_MAKE_READABLE(im->image.data, siz); | 371 | VALGRIND_MAKE_READABLE(im->image.data, siz); |
@@ -332,7 +376,9 @@ _evas_common_rgba_image_surface_alloc(Image_Entry *ie, unsigned int w, unsigned | |||
332 | # endif | 376 | # endif |
333 | #endif | 377 | #endif |
334 | _evas_common_rgba_image_post_surface(ie); | 378 | _evas_common_rgba_image_post_surface(ie); |
335 | 379 | #ifdef SURFDBG | |
380 | surf_debug(); | ||
381 | #endif | ||
336 | return 0; | 382 | return 0; |
337 | } | 383 | } |
338 | 384 | ||
@@ -366,7 +412,12 @@ _evas_common_rgba_image_surface_delete(Image_Entry *ie) | |||
366 | im->cs.data = NULL; | 412 | im->cs.data = NULL; |
367 | 413 | ||
368 | if (im->image.data && !im->image.no_free) | 414 | if (im->image.data && !im->image.no_free) |
369 | free(im->image.data); | 415 | { |
416 | free(im->image.data); | ||
417 | #ifdef SURFDBG | ||
418 | surfs = eina_list_remove(surfs, ie); | ||
419 | #endif | ||
420 | } | ||
370 | #ifdef EVAS_CSERVE | 421 | #ifdef EVAS_CSERVE |
371 | else if (ie->data1) | 422 | else if (ie->data1) |
372 | evas_cserve_image_free(ie); | 423 | evas_cserve_image_free(ie); |
@@ -380,6 +431,9 @@ _evas_common_rgba_image_surface_delete(Image_Entry *ie) | |||
380 | #endif | 431 | #endif |
381 | ie->flags.loaded = 0; | 432 | ie->flags.loaded = 0; |
382 | evas_common_rgba_image_scalecache_dirty(&im->cache_entry); | 433 | evas_common_rgba_image_scalecache_dirty(&im->cache_entry); |
434 | #ifdef SURFDBG | ||
435 | surf_debug(); | ||
436 | #endif | ||
383 | } | 437 | } |
384 | 438 | ||
385 | static void | 439 | static void |
@@ -597,7 +651,15 @@ evas_common_image_colorspace_normalize(RGBA_Image *im) | |||
597 | #ifdef EVAS_CSERVE | 651 | #ifdef EVAS_CSERVE |
598 | if (((Image_Entry *)im)->data1) evas_cserve_image_free(&im->cache_entry); | 652 | if (((Image_Entry *)im)->data1) evas_cserve_image_free(&im->cache_entry); |
599 | #endif | 653 | #endif |
600 | if (!im->image.no_free) free(im->image.data); | 654 | if (!im->image.no_free) |
655 | { | ||
656 | free(im->image.data); | ||
657 | #ifdef SURFDBG | ||
658 | surfs = eina_list_remove(surfs, im); | ||
659 | #endif | ||
660 | ((Image_Entry *)im)->allocated.w = 0; | ||
661 | ((Image_Entry *)im)->allocated.h = 0; | ||
662 | } | ||
601 | im->image.data = im->cs.data; | 663 | im->image.data = im->cs.data; |
602 | im->cs.no_free = im->image.no_free; | 664 | im->cs.no_free = im->image.no_free; |
603 | } | 665 | } |
@@ -634,6 +696,9 @@ evas_common_image_colorspace_normalize(RGBA_Image *im) | |||
634 | break; | 696 | break; |
635 | } | 697 | } |
636 | im->cs.dirty = 0; | 698 | im->cs.dirty = 0; |
699 | #ifdef SURFDBG | ||
700 | surf_debug(); | ||
701 | #endif | ||
637 | } | 702 | } |
638 | 703 | ||
639 | EAPI void | 704 | EAPI void |
diff --git a/libraries/evas/src/lib/engines/common/evas_op_add/Makefile.in b/libraries/evas/src/lib/engines/common/evas_op_add/Makefile.in index 78e893d..61d3479 100644 --- a/libraries/evas/src/lib/engines/common/evas_op_add/Makefile.in +++ b/libraries/evas/src/lib/engines/common/evas_op_add/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/engines/common/evas_op_blend/Makefile.am b/libraries/evas/src/lib/engines/common/evas_op_blend/Makefile.am index 84add38..77435c4 100644 --- a/libraries/evas/src/lib/engines/common/evas_op_blend/Makefile.am +++ b/libraries/evas/src/lib/engines/common/evas_op_blend/Makefile.am | |||
@@ -40,11 +40,7 @@ libevas_engine_common_op_blend_master_sse3_la_CFLAGS = \ | |||
40 | @FREETYPE_CFLAGS@ @VALGRIND_CFLAGS@ \ | 40 | @FREETYPE_CFLAGS@ @VALGRIND_CFLAGS@ \ |
41 | @PIXMAN_CFLAGS@ \ | 41 | @PIXMAN_CFLAGS@ \ |
42 | @EET_CFLAGS@ @pthread_cflags@ \ | 42 | @EET_CFLAGS@ @pthread_cflags@ \ |
43 | @WIN32_CFLAGS@ @EINA_CFLAGS@ \ | 43 | @EINA_CFLAGS@ \ |
44 | @FRIBIDI_CFLAGS@ @HARFBUZZ_CFLAGS@ \ | 44 | @FRIBIDI_CFLAGS@ @HARFBUZZ_CFLAGS@ \ |
45 | @PIXMAN_CFLAGS@ \ | 45 | @PIXMAN_CFLAGS@ \ |
46 | @EVAS_SSE3_CFLAGS@ | 46 | @EVAS_SSE3_CFLAGS@ |
47 | |||
48 | libevas_engine_common_op_blend_master_sse3_la_DEPENENCIES = \ | ||
49 | $(top_builddir)/config.h | ||
50 | |||
diff --git a/libraries/evas/src/lib/engines/common/evas_op_blend/Makefile.in b/libraries/evas/src/lib/engines/common/evas_op_blend/Makefile.in index e00dac8..016b49c 100644 --- a/libraries/evas/src/lib/engines/common/evas_op_blend/Makefile.in +++ b/libraries/evas/src/lib/engines/common/evas_op_blend/Makefile.in | |||
@@ -153,6 +153,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
153 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 153 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
154 | EVIL_LIBS = @EVIL_LIBS@ | 154 | EVIL_LIBS = @EVIL_LIBS@ |
155 | EXEEXT = @EXEEXT@ | 155 | EXEEXT = @EXEEXT@ |
156 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
157 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
156 | FGREP = @FGREP@ | 158 | FGREP = @FGREP@ |
157 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 159 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
158 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 160 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -203,6 +205,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
203 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 205 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
204 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 206 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
205 | PKG_CONFIG = @PKG_CONFIG@ | 207 | PKG_CONFIG = @PKG_CONFIG@ |
208 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
209 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
206 | PNG_CFLAGS = @PNG_CFLAGS@ | 210 | PNG_CFLAGS = @PNG_CFLAGS@ |
207 | PNG_LIBS = @PNG_LIBS@ | 211 | PNG_LIBS = @PNG_LIBS@ |
208 | RANLIB = @RANLIB@ | 212 | RANLIB = @RANLIB@ |
@@ -221,8 +225,6 @@ VERSION = @VERSION@ | |||
221 | VMAJ = @VMAJ@ | 225 | VMAJ = @VMAJ@ |
222 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 226 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
223 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 227 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
224 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
225 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
226 | XCB_CFLAGS = @XCB_CFLAGS@ | 228 | XCB_CFLAGS = @XCB_CFLAGS@ |
227 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 229 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
228 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 230 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -296,8 +298,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
296 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 298 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
297 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 299 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
298 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 300 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
299 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
300 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
301 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 301 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
302 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 302 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
303 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 303 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -420,14 +420,11 @@ libevas_engine_common_op_blend_master_sse3_la_CFLAGS = \ | |||
420 | @FREETYPE_CFLAGS@ @VALGRIND_CFLAGS@ \ | 420 | @FREETYPE_CFLAGS@ @VALGRIND_CFLAGS@ \ |
421 | @PIXMAN_CFLAGS@ \ | 421 | @PIXMAN_CFLAGS@ \ |
422 | @EET_CFLAGS@ @pthread_cflags@ \ | 422 | @EET_CFLAGS@ @pthread_cflags@ \ |
423 | @WIN32_CFLAGS@ @EINA_CFLAGS@ \ | 423 | @EINA_CFLAGS@ \ |
424 | @FRIBIDI_CFLAGS@ @HARFBUZZ_CFLAGS@ \ | 424 | @FRIBIDI_CFLAGS@ @HARFBUZZ_CFLAGS@ \ |
425 | @PIXMAN_CFLAGS@ \ | 425 | @PIXMAN_CFLAGS@ \ |
426 | @EVAS_SSE3_CFLAGS@ | 426 | @EVAS_SSE3_CFLAGS@ |
427 | 427 | ||
428 | libevas_engine_common_op_blend_master_sse3_la_DEPENENCIES = \ | ||
429 | $(top_builddir)/config.h | ||
430 | |||
431 | all: all-am | 428 | all: all-am |
432 | 429 | ||
433 | .SUFFIXES: | 430 | .SUFFIXES: |
diff --git a/libraries/evas/src/lib/engines/common/evas_op_copy/Makefile.in b/libraries/evas/src/lib/engines/common/evas_op_copy/Makefile.in index 40536c0..687f34d 100644 --- a/libraries/evas/src/lib/engines/common/evas_op_copy/Makefile.in +++ b/libraries/evas/src/lib/engines/common/evas_op_copy/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/engines/common/evas_op_mask/Makefile.in b/libraries/evas/src/lib/engines/common/evas_op_mask/Makefile.in index d5764b1..00b536a 100644 --- a/libraries/evas/src/lib/engines/common/evas_op_mask/Makefile.in +++ b/libraries/evas/src/lib/engines/common/evas_op_mask/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/engines/common/evas_op_mul/Makefile.in b/libraries/evas/src/lib/engines/common/evas_op_mul/Makefile.in index d5452fe..849983e 100644 --- a/libraries/evas/src/lib/engines/common/evas_op_mul/Makefile.in +++ b/libraries/evas/src/lib/engines/common/evas_op_mul/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/engines/common/evas_op_sub/Makefile.in b/libraries/evas/src/lib/engines/common/evas_op_sub/Makefile.in index 4b93b1b..885465a 100644 --- a/libraries/evas/src/lib/engines/common/evas_op_sub/Makefile.in +++ b/libraries/evas/src/lib/engines/common/evas_op_sub/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/engines/common/evas_polygon_main.c b/libraries/evas/src/lib/engines/common/evas_polygon_main.c index ea0bf13..6840d60 100644 --- a/libraries/evas/src/lib/engines/common/evas_polygon_main.c +++ b/libraries/evas/src/lib/engines/common/evas_polygon_main.c | |||
@@ -133,7 +133,7 @@ evas_common_polygon_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Po | |||
133 | int num_active_edges; | 133 | int num_active_edges; |
134 | int n; | 134 | int n; |
135 | int i, j, k; | 135 | int i, j, k; |
136 | int y0, y1, yi; | 136 | int yy0, yy1, yi; |
137 | int ext_x, ext_y, ext_w, ext_h; | 137 | int ext_x, ext_y, ext_w, ext_h; |
138 | int *sorted_index; | 138 | int *sorted_index; |
139 | 139 | ||
@@ -211,14 +211,14 @@ evas_common_polygon_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Po | |||
211 | k++; | 211 | k++; |
212 | } | 212 | } |
213 | 213 | ||
214 | y0 = MAX(ext_y, ceil(point[sorted_index[0]].y - 0.5)); | 214 | yy0 = MAX(ext_y, ceil(point[sorted_index[0]].y - 0.5)); |
215 | y1 = MIN(ext_y + ext_h - 1, floor(point[sorted_index[n - 1]].y - 0.5)); | 215 | yy1 = MIN(ext_y + ext_h - 1, floor(point[sorted_index[n - 1]].y - 0.5)); |
216 | 216 | ||
217 | k = 0; | 217 | k = 0; |
218 | num_active_edges = 0; | 218 | num_active_edges = 0; |
219 | spans = NULL; | 219 | spans = NULL; |
220 | 220 | ||
221 | for (yi = y0; yi <= y1; yi++) | 221 | for (yi = yy0; yi <= yy1; yi++) |
222 | { | 222 | { |
223 | for (; (k < n) && (point[sorted_index[k]].y <= ((double)yi + 0.5)); k++) | 223 | for (; (k < n) && (point[sorted_index[k]].y <= ((double)yi + 0.5)); k++) |
224 | { | 224 | { |
diff --git a/libraries/evas/src/lib/engines/common/evas_scale_sample.c b/libraries/evas/src/lib/engines/common/evas_scale_sample.c index a8951b8..c721c5e 100644 --- a/libraries/evas/src/lib/engines/common/evas_scale_sample.c +++ b/libraries/evas/src/lib/engines/common/evas_scale_sample.c | |||
@@ -90,7 +90,6 @@ scale_rgba_in_to_out_clip_sample_internal(RGBA_Image *src, RGBA_Image *dst, | |||
90 | DATA32 *buf, *dptr; | 90 | DATA32 *buf, *dptr; |
91 | DATA32 **row_ptr; | 91 | DATA32 **row_ptr; |
92 | DATA32 *ptr, *dst_ptr, *src_data, *dst_data; | 92 | DATA32 *ptr, *dst_ptr, *src_data, *dst_data; |
93 | int dst_jump; | ||
94 | int dst_clip_x, dst_clip_y, dst_clip_w, dst_clip_h; | 93 | int dst_clip_x, dst_clip_y, dst_clip_w, dst_clip_h; |
95 | int m_clip_x = 0, m_clip_y = 0, m_clip_w = 0, m_clip_h = 0, mdx = 0, mdy = 0; | 94 | int m_clip_x = 0, m_clip_y = 0, m_clip_w = 0, m_clip_h = 0, mdx = 0, mdy = 0; |
96 | int src_w, src_h, dst_w, dst_h; | 95 | int src_w, src_h, dst_w, dst_h; |
@@ -248,7 +247,7 @@ scale_rgba_in_to_out_clip_sample_internal(RGBA_Image *src, RGBA_Image *dst, | |||
248 | row_ptr = alloca(dst_clip_h * sizeof(DATA32 *)); | 247 | row_ptr = alloca(dst_clip_h * sizeof(DATA32 *)); |
249 | 248 | ||
250 | /* figure out dst jump */ | 249 | /* figure out dst jump */ |
251 | dst_jump = dst_w - dst_clip_w; | 250 | //dst_jump = dst_w - dst_clip_w; |
252 | 251 | ||
253 | /* figure out dest start ptr */ | 252 | /* figure out dest start ptr */ |
254 | dst_ptr = dst_data + dst_clip_x + (dst_clip_y * dst_w); | 253 | dst_ptr = dst_data + dst_clip_x + (dst_clip_y * dst_w); |
diff --git a/libraries/evas/src/lib/engines/common/evas_scale_smooth_scaler_downx.c b/libraries/evas/src/lib/engines/common/evas_scale_smooth_scaler_downx.c index 50b2e5c..a443c85 100644 --- a/libraries/evas/src/lib/engines/common/evas_scale_smooth_scaler_downx.c +++ b/libraries/evas/src/lib/engines/common/evas_scale_smooth_scaler_downx.c | |||
@@ -3,7 +3,7 @@ | |||
3 | DATA32 *pix, *dptr, *pbuf, **yp; | 3 | DATA32 *pix, *dptr, *pbuf, **yp; |
4 | int r, g, b, a, rr, gg, bb, aa; | 4 | int r, g, b, a, rr, gg, bb, aa; |
5 | int *xp, xap, yap, pos; | 5 | int *xp, xap, yap, pos; |
6 | int dyy, dxx; | 6 | //int dyy, dxx; |
7 | int w = dst_clip_w; | 7 | int w = dst_clip_w; |
8 | #ifdef EVAS_SLI | 8 | #ifdef EVAS_SLI |
9 | int ysli = dst_clip_y; | 9 | int ysli = dst_clip_y; |
@@ -11,8 +11,8 @@ | |||
11 | 11 | ||
12 | dptr = dst_ptr; | 12 | dptr = dst_ptr; |
13 | pos = (src_region_y * src_w) + src_region_x; | 13 | pos = (src_region_y * src_w) + src_region_x; |
14 | dyy = dst_clip_y - dst_region_y; | 14 | //dyy = dst_clip_y - dst_region_y; |
15 | dxx = dst_clip_x - dst_region_x; | 15 | //dxx = dst_clip_x - dst_region_x; |
16 | 16 | ||
17 | xp = xpoints;// + dxx; | 17 | xp = xpoints;// + dxx; |
18 | yp = ypoints;// + dyy; | 18 | yp = ypoints;// + dyy; |
diff --git a/libraries/evas/src/lib/engines/common/evas_scale_smooth_scaler_downx_downy.c b/libraries/evas/src/lib/engines/common/evas_scale_smooth_scaler_downx_downy.c index ab0c74e..73da3a0 100644 --- a/libraries/evas/src/lib/engines/common/evas_scale_smooth_scaler_downx_downy.c +++ b/libraries/evas/src/lib/engines/common/evas_scale_smooth_scaler_downx_downy.c | |||
@@ -3,7 +3,7 @@ | |||
3 | DATA32 *dptr, *sptr, *pix, *pbuf; | 3 | DATA32 *dptr, *sptr, *pix, *pbuf; |
4 | int a, r, g, b, rx, gx, bx, ax; | 4 | int a, r, g, b, rx, gx, bx, ax; |
5 | int xap, yap, pos; | 5 | int xap, yap, pos; |
6 | int dyy, dxx; | 6 | //int dyy, dxx; |
7 | #ifdef EVAS_SLI | 7 | #ifdef EVAS_SLI |
8 | int ysli = dst_clip_y; | 8 | int ysli = dst_clip_y; |
9 | #endif | 9 | #endif |
@@ -14,8 +14,8 @@ | |||
14 | 14 | ||
15 | dptr = dst_ptr; | 15 | dptr = dst_ptr; |
16 | pos = (src_region_y * src_w) + src_region_x; | 16 | pos = (src_region_y * src_w) + src_region_x; |
17 | dyy = dst_clip_y - dst_region_y; | 17 | //dyy = dst_clip_y - dst_region_y; |
18 | dxx = dst_clip_x - dst_region_x; | 18 | //dxx = dst_clip_x - dst_region_x; |
19 | 19 | ||
20 | xp = xpoints;// + dxx; | 20 | xp = xpoints;// + dxx; |
21 | yp = ypoints;// + dyy; | 21 | yp = ypoints;// + dyy; |
diff --git a/libraries/evas/src/lib/engines/common/evas_scale_smooth_scaler_downy.c b/libraries/evas/src/lib/engines/common/evas_scale_smooth_scaler_downy.c index 4c5448e..3b7585d 100644 --- a/libraries/evas/src/lib/engines/common/evas_scale_smooth_scaler_downy.c +++ b/libraries/evas/src/lib/engines/common/evas_scale_smooth_scaler_downy.c | |||
@@ -3,7 +3,7 @@ | |||
3 | DATA32 *dptr, *pix, *pbuf, **yp; | 3 | DATA32 *dptr, *pix, *pbuf, **yp; |
4 | int r, g, b, a, rr, gg, bb, aa; | 4 | int r, g, b, a, rr, gg, bb, aa; |
5 | int *xp, xap, yap, pos; | 5 | int *xp, xap, yap, pos; |
6 | int dyy, dxx; | 6 | //int dyy, dxx; |
7 | int w = dst_clip_w; | 7 | int w = dst_clip_w; |
8 | #ifdef EVAS_SLI | 8 | #ifdef EVAS_SLI |
9 | int ysli = dst_clip_y; | 9 | int ysli = dst_clip_y; |
@@ -11,8 +11,8 @@ | |||
11 | 11 | ||
12 | dptr = dst_ptr; | 12 | dptr = dst_ptr; |
13 | pos = (src_region_y * src_w) + src_region_x; | 13 | pos = (src_region_y * src_w) + src_region_x; |
14 | dyy = dst_clip_y - dst_region_y; | 14 | //dyy = dst_clip_y - dst_region_y; |
15 | dxx = dst_clip_x - dst_region_x; | 15 | //dxx = dst_clip_x - dst_region_x; |
16 | 16 | ||
17 | xp = xpoints;// + dxx; | 17 | xp = xpoints;// + dxx; |
18 | yp = ypoints;// + dyy; | 18 | yp = ypoints;// + dyy; |
diff --git a/libraries/evas/src/lib/engines/common/evas_tiler.c b/libraries/evas/src/lib/engines/common/evas_tiler.c index ff359a4..bc5e99c 100644 --- a/libraries/evas/src/lib/engines/common/evas_tiler.c +++ b/libraries/evas/src/lib/engines/common/evas_tiler.c | |||
@@ -1167,40 +1167,84 @@ evas_common_tilebuf_get_render_rects(Tilebuf *tb) | |||
1167 | #elif defined(EVAS_RECT_SPLIT) | 1167 | #elif defined(EVAS_RECT_SPLIT) |
1168 | list_node_t *n; | 1168 | list_node_t *n; |
1169 | Tilebuf_Rect *rects = NULL; | 1169 | Tilebuf_Rect *rects = NULL; |
1170 | int bx1 = 0, bx2 = 0, by1 = 0, by2 = 0, num = 0; | ||
1170 | 1171 | ||
1171 | if (tb->need_merge) { | 1172 | if (tb->need_merge) |
1172 | list_t to_merge; | 1173 | { |
1173 | to_merge = tb->rects; | 1174 | list_t to_merge; |
1174 | tb->rects = list_zeroed; | 1175 | to_merge = tb->rects; |
1175 | rect_list_merge_rects(&tb->rects, &to_merge, FUZZ * FUZZ); | 1176 | tb->rects = list_zeroed; |
1176 | tb->need_merge = 0; | 1177 | rect_list_merge_rects(&tb->rects, &to_merge, FUZZ * FUZZ); |
1177 | } | 1178 | tb->need_merge = 0; |
1178 | 1179 | } | |
1179 | for (n = tb->rects.head; n; n = n->next) { | 1180 | |
1180 | rect_t cur; | 1181 | n = tb->rects.head; |
1182 | if (n) | ||
1183 | { | ||
1184 | bx1 = ((rect_node_t *)n)->rect.left; | ||
1185 | bx2 = bx1 + ((rect_node_t *)n)->rect.width; | ||
1186 | by1 = ((rect_node_t *)n)->rect.top; | ||
1187 | by2 = by1 + ((rect_node_t *)n)->rect.height; | ||
1188 | n = n->next; | ||
1189 | for (; n; n = n->next) | ||
1190 | { | ||
1191 | |||
1192 | int x1, x2, y1, y2; | ||
1193 | |||
1194 | x1 = ((rect_node_t *)n)->rect.left; | ||
1195 | if (x1 < bx1) bx1 = x1; | ||
1196 | x2 = x1 + ((rect_node_t *)n)->rect.width; | ||
1197 | if (x2 > bx2) bx2 = x2; | ||
1198 | |||
1199 | y1 = ((rect_node_t *)n)->rect.top; | ||
1200 | if (y1 < by1) by1 = y1; | ||
1201 | y2 = y1 + ((rect_node_t *)n)->rect.height; | ||
1202 | if (y2 > by2) by2 = y2; | ||
1203 | num++; | ||
1204 | } | ||
1205 | } | ||
1206 | #define MAXREG 24 | ||
1207 | /* magic number - but if we have > MAXREG regions to update, take bounding box */ | ||
1208 | if (num > MAXREG) | ||
1209 | { | ||
1210 | Tilebuf_Rect *r; | ||
1211 | |||
1212 | r = malloc(sizeof(Tilebuf_Rect)); | ||
1213 | r->x = bx1; | ||
1214 | r->y = by1; | ||
1215 | r->w = bx2 - bx1; | ||
1216 | r->h = by2 - by1; | ||
1217 | |||
1218 | rects = (Tilebuf_Rect *)eina_inlist_append(EINA_INLIST_GET(rects), EINA_INLIST_GET(r)); | ||
1219 | return rects; | ||
1220 | } | ||
1181 | 1221 | ||
1182 | cur = ((rect_node_t *)n)->rect; | 1222 | for (n = tb->rects.head; n; n = n->next) |
1223 | { | ||
1224 | rect_t cur; | ||
1225 | |||
1226 | cur = ((rect_node_t *)n)->rect; | ||
1183 | /* disable fuzz - created bugs. | 1227 | /* disable fuzz - created bugs. |
1184 | cur.left <<= 1; | 1228 | cur.left <<= 1; |
1185 | cur.top <<= 1; | 1229 | cur.top <<= 1; |
1186 | cur.width <<= 1; | 1230 | cur.width <<= 1; |
1187 | cur.height <<= 1; | 1231 | cur.height <<= 1; |
1188 | */ | 1232 | */ |
1189 | RECTS_CLIP_TO_RECT(cur.left, cur.top, cur.width, cur.height, | 1233 | RECTS_CLIP_TO_RECT(cur.left, cur.top, cur.width, cur.height, |
1190 | 0, 0, tb->outbuf_w, tb->outbuf_h); | 1234 | 0, 0, tb->outbuf_w, tb->outbuf_h); |
1191 | if ((cur.width > 0) && (cur.height > 0)) | 1235 | if ((cur.width > 0) && (cur.height > 0)) |
1192 | { | 1236 | { |
1193 | Tilebuf_Rect *r; | 1237 | Tilebuf_Rect *r; |
1194 | 1238 | ||
1195 | r = malloc(sizeof(Tilebuf_Rect)); | 1239 | r = malloc(sizeof(Tilebuf_Rect)); |
1196 | r->x = cur.left; | 1240 | r->x = cur.left; |
1197 | r->y = cur.top; | 1241 | r->y = cur.top; |
1198 | r->w = cur.width; | 1242 | r->w = cur.width; |
1199 | r->h = cur.height; | 1243 | r->h = cur.height; |
1200 | 1244 | ||
1201 | rects = (Tilebuf_Rect *)eina_inlist_append(EINA_INLIST_GET(rects), EINA_INLIST_GET(r)); | 1245 | rects = (Tilebuf_Rect *)eina_inlist_append(EINA_INLIST_GET(rects), EINA_INLIST_GET(r)); |
1202 | } | 1246 | } |
1203 | } | 1247 | } |
1204 | return rects; | 1248 | return rects; |
1205 | 1249 | ||
1206 | #else | 1250 | #else |
diff --git a/libraries/evas/src/lib/engines/common_16/Makefile.in b/libraries/evas/src/lib/engines/common_16/Makefile.in index 313cbda..196395d 100644 --- a/libraries/evas/src/lib/engines/common_16/Makefile.in +++ b/libraries/evas/src/lib/engines/common_16/Makefile.in | |||
@@ -151,6 +151,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
151 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 151 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
152 | EVIL_LIBS = @EVIL_LIBS@ | 152 | EVIL_LIBS = @EVIL_LIBS@ |
153 | EXEEXT = @EXEEXT@ | 153 | EXEEXT = @EXEEXT@ |
154 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
155 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
154 | FGREP = @FGREP@ | 156 | FGREP = @FGREP@ |
155 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 157 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
156 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 158 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -201,6 +203,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
201 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 203 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
202 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 204 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
203 | PKG_CONFIG = @PKG_CONFIG@ | 205 | PKG_CONFIG = @PKG_CONFIG@ |
206 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
207 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
204 | PNG_CFLAGS = @PNG_CFLAGS@ | 208 | PNG_CFLAGS = @PNG_CFLAGS@ |
205 | PNG_LIBS = @PNG_LIBS@ | 209 | PNG_LIBS = @PNG_LIBS@ |
206 | RANLIB = @RANLIB@ | 210 | RANLIB = @RANLIB@ |
@@ -219,8 +223,6 @@ VERSION = @VERSION@ | |||
219 | VMAJ = @VMAJ@ | 223 | VMAJ = @VMAJ@ |
220 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 224 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
221 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 225 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
222 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
223 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
224 | XCB_CFLAGS = @XCB_CFLAGS@ | 226 | XCB_CFLAGS = @XCB_CFLAGS@ |
225 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 227 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
226 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 228 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -294,8 +296,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
294 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 296 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
295 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 297 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
296 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 298 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
297 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
298 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
299 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 299 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
300 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 300 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
301 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 301 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
diff --git a/libraries/evas/src/lib/engines/common_8/Makefile.in b/libraries/evas/src/lib/engines/common_8/Makefile.in index 7fa4fbb..11b2454 100644 --- a/libraries/evas/src/lib/engines/common_8/Makefile.in +++ b/libraries/evas/src/lib/engines/common_8/Makefile.in | |||
@@ -150,6 +150,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
150 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 150 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
151 | EVIL_LIBS = @EVIL_LIBS@ | 151 | EVIL_LIBS = @EVIL_LIBS@ |
152 | EXEEXT = @EXEEXT@ | 152 | EXEEXT = @EXEEXT@ |
153 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
154 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
153 | FGREP = @FGREP@ | 155 | FGREP = @FGREP@ |
154 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 156 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
155 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 157 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -200,6 +202,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
200 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 202 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
201 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 203 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
202 | PKG_CONFIG = @PKG_CONFIG@ | 204 | PKG_CONFIG = @PKG_CONFIG@ |
205 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
206 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
203 | PNG_CFLAGS = @PNG_CFLAGS@ | 207 | PNG_CFLAGS = @PNG_CFLAGS@ |
204 | PNG_LIBS = @PNG_LIBS@ | 208 | PNG_LIBS = @PNG_LIBS@ |
205 | RANLIB = @RANLIB@ | 209 | RANLIB = @RANLIB@ |
@@ -218,8 +222,6 @@ VERSION = @VERSION@ | |||
218 | VMAJ = @VMAJ@ | 222 | VMAJ = @VMAJ@ |
219 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 223 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
220 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 224 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
221 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
222 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
223 | XCB_CFLAGS = @XCB_CFLAGS@ | 225 | XCB_CFLAGS = @XCB_CFLAGS@ |
224 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 226 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
225 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 227 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -293,8 +295,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
293 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 295 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
294 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 296 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
295 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 297 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
296 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
297 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
298 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 298 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
299 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 299 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
300 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 300 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |