summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2011-04-22 11:47:14 +0000
committerCarsten Haitzler <raster@rasterman.com>2011-04-22 11:47:14 +0000
commitc885080057631dbb7e99b20d1f4fcc9b6076a5a7 (patch)
tree6d207c09f02db1b75f3c0549c91755659b09b357
parent02ee0d1ee65f6a79bc2397d1b9c93e90eaa1032c (diff)
an initial test at trying pixman instead of evas software rendering.
results... in comments. disabled atm unless u --enable it. only replaces 1 operation in 2 cases. SVN revision: 58824
Diffstat (limited to '')
-rw-r--r--legacy/evas/configure.ac30
-rw-r--r--legacy/evas/src/bin/Makefile.am3
-rw-r--r--legacy/evas/src/examples/Makefile.am1
-rw-r--r--legacy/evas/src/lib/Makefile.am4
-rw-r--r--legacy/evas/src/lib/cache/Makefile.am4
-rw-r--r--legacy/evas/src/lib/canvas/Makefile.am3
-rw-r--r--legacy/evas/src/lib/cserve/Makefile.am3
-rw-r--r--legacy/evas/src/lib/engines/common/Makefile.am4
-rw-r--r--legacy/evas/src/lib/engines/common/evas_image_data.c4
-rw-r--r--legacy/evas/src/lib/engines/common/evas_image_main.c47
-rw-r--r--legacy/evas/src/lib/engines/common/evas_image_private.h4
-rw-r--r--legacy/evas/src/lib/engines/common/evas_image_scalecache.c17
-rw-r--r--legacy/evas/src/lib/engines/common/evas_scale_sample.c56
-rw-r--r--legacy/evas/src/lib/engines/common_16/Makefile.am1
-rw-r--r--legacy/evas/src/lib/engines/common_8/Makefile.am1
-rw-r--r--legacy/evas/src/lib/file/Makefile.am5
-rw-r--r--legacy/evas/src/lib/include/evas_common.h10
-rw-r--r--legacy/evas/src/modules/engines/buffer/Makefile.am3
-rw-r--r--legacy/evas/src/modules/engines/direct3d/Makefile.am1
-rw-r--r--legacy/evas/src/modules/engines/directfb/Makefile.am1
-rw-r--r--legacy/evas/src/modules/engines/fb/Makefile.am1
-rw-r--r--legacy/evas/src/modules/engines/gl_common/Makefile.am1
-rw-r--r--legacy/evas/src/modules/engines/gl_sdl/Makefile.am1
-rw-r--r--legacy/evas/src/modules/engines/gl_x11/Makefile.am1
-rw-r--r--legacy/evas/src/modules/engines/software_16/Makefile.am1
-rw-r--r--legacy/evas/src/modules/engines/software_16_ddraw/Makefile.am1
-rw-r--r--legacy/evas/src/modules/engines/software_16_sdl/Makefile.am2
-rw-r--r--legacy/evas/src/modules/engines/software_16_wince/Makefile.am1
-rw-r--r--legacy/evas/src/modules/engines/software_16_x11/Makefile.am1
-rw-r--r--legacy/evas/src/modules/engines/software_8/Makefile.am1
-rw-r--r--legacy/evas/src/modules/engines/software_8_x11/Makefile.am1
-rw-r--r--legacy/evas/src/modules/engines/software_ddraw/Makefile.am1
-rw-r--r--legacy/evas/src/modules/engines/software_gdi/Makefile.am1
-rw-r--r--legacy/evas/src/modules/engines/software_generic/Makefile.am3
-rw-r--r--legacy/evas/src/modules/engines/software_sdl/Makefile.am1
-rw-r--r--legacy/evas/src/modules/engines/software_x11/Makefile.am1
-rw-r--r--legacy/evas/src/modules/loaders/bmp/Makefile.am1
-rw-r--r--legacy/evas/src/modules/loaders/edb/Makefile.am1
-rw-r--r--legacy/evas/src/modules/loaders/eet/Makefile.am1
-rw-r--r--legacy/evas/src/modules/loaders/gif/Makefile.am1
-rw-r--r--legacy/evas/src/modules/loaders/ico/Makefile.am1
-rw-r--r--legacy/evas/src/modules/loaders/jpeg/Makefile.am1
-rw-r--r--legacy/evas/src/modules/loaders/pmaps/Makefile.am1
-rw-r--r--legacy/evas/src/modules/loaders/png/Makefile.am1
-rw-r--r--legacy/evas/src/modules/loaders/svg/Makefile.am1
-rw-r--r--legacy/evas/src/modules/loaders/tga/Makefile.am1
-rw-r--r--legacy/evas/src/modules/loaders/tiff/Makefile.am1
-rw-r--r--legacy/evas/src/modules/loaders/wbmp/Makefile.am1
-rw-r--r--legacy/evas/src/modules/loaders/xpm/Makefile.am1
-rw-r--r--legacy/evas/src/modules/savers/edb/Makefile.am2
-rw-r--r--legacy/evas/src/modules/savers/eet/Makefile.am1
-rw-r--r--legacy/evas/src/modules/savers/jpeg/Makefile.am1
-rw-r--r--legacy/evas/src/modules/savers/png/Makefile.am1
-rw-r--r--legacy/evas/src/modules/savers/tiff/Makefile.am1
54 files changed, 198 insertions, 42 deletions
diff --git a/legacy/evas/configure.ac b/legacy/evas/configure.ac
index af82b91aa8..72f50898b9 100644
--- a/legacy/evas/configure.ac
+++ b/legacy/evas/configure.ac
@@ -90,6 +90,7 @@ AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
90want_fontconfig="auto" 90want_fontconfig="auto"
91want_fribidi="auto" 91want_fribidi="auto"
92want_harfbuzz="auto" 92want_harfbuzz="auto"
93want_pixman="no"
93want_evas_cserve="yes" 94want_evas_cserve="yes"
94 95
95want_evas_engine_buffer="yes" 96want_evas_engine_buffer="yes"
@@ -359,6 +360,35 @@ if test "x${have_harfbuzz}" = "xno"; then
359 HAS_HARFBUZZ=0 360 HAS_HARFBUZZ=0
360fi 361fi
361 362
363# Pixman
364have_pixman="no"
365AC_ARG_ENABLE([pixman],
366 AC_HELP_STRING([--disable-pixman],
367 [disable pixman for software rendering. @<:@default=enabled@:>@]),
368 [
369 if test "x${enableval}" = "xyes" ; then
370 want_pixman="yes"
371 else
372 want_pixman="no"
373 fi
374 ])
375
376
377if test "x${want_pixman}" = "xyes" -o "x${want_pixman}" = "xauto" ; then
378 PKG_CHECK_MODULES([PIXMAN],
379 [pixman-1],
380 [
381 have_pixman="yes"
382 AC_DEFINE(HAVE_PIXMAN, 1, [have pixman for rendering])
383 requirement_evas="pixman-1 ${requirement_evas}"
384 ],
385 [
386 if test "x${want_pixman}" = "xyes" -a "x${use_strict}" = "xyes" ; then
387 AC_MSG_ERROR([Pixman not found (strict dependencies checking)])
388 fi
389 ])
390fi
391
362### Checks for header files 392### Checks for header files
363AC_HEADER_STDC 393AC_HEADER_STDC
364AC_CHECK_HEADERS([unistd.h stdint.h sys/param.h]) 394AC_CHECK_HEADERS([unistd.h stdint.h sys/param.h])
diff --git a/legacy/evas/src/bin/Makefile.am b/legacy/evas/src/bin/Makefile.am
index b8ad0151cb..987e14be8c 100644
--- a/legacy/evas/src/bin/Makefile.am
+++ b/legacy/evas/src/bin/Makefile.am
@@ -15,7 +15,8 @@ AM_CPPFLAGS = \
15@FRIBIDI_CFLAGS@ \ 15@FRIBIDI_CFLAGS@ \
16@EET_CFLAGS@ \ 16@EET_CFLAGS@ \
17@FONTCONFIG_CFLAGS@ \ 17@FONTCONFIG_CFLAGS@ \
18@pthread_cflags@ 18@pthread_cflags@ \
19@PIXMAN_CFLAGS@
19 20
20AM_CFLAGS = @WIN32_CFLAGS@ 21AM_CFLAGS = @WIN32_CFLAGS@
21 22
diff --git a/legacy/evas/src/examples/Makefile.am b/legacy/evas/src/examples/Makefile.am
index 746146dc80..ee5114d9ad 100644
--- a/legacy/evas/src/examples/Makefile.am
+++ b/legacy/evas/src/examples/Makefile.am
@@ -13,6 +13,7 @@ AM_CPPFLAGS = \
13-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 13-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
14@EINA_CFLAGS@ \ 14@EINA_CFLAGS@ \
15@FREETYPE_CFLAGS@ \ 15@FREETYPE_CFLAGS@ \
16@PIXMAN_CFLAGS@ \
16@FRIBIDI_CFLAGS@ \ 17@FRIBIDI_CFLAGS@ \
17@EET_CFLAGS@ \ 18@EET_CFLAGS@ \
18@FONTCONFIG_CFLAGS@ \ 19@FONTCONFIG_CFLAGS@ \
diff --git a/legacy/evas/src/lib/Makefile.am b/legacy/evas/src/lib/Makefile.am
index f2f6041fb1..6e44840190 100644
--- a/legacy/evas/src/lib/Makefile.am
+++ b/legacy/evas/src/lib/Makefile.am
@@ -178,7 +178,8 @@ AM_CPPFLAGS = \
178@HARFBUZZ_CFLAGS@ \ 178@HARFBUZZ_CFLAGS@ \
179@EET_CFLAGS@ \ 179@EET_CFLAGS@ \
180@FONTCONFIG_CFLAGS@ \ 180@FONTCONFIG_CFLAGS@ \
181@pthread_cflags@ 181@pthread_cflags@ \
182@PIXMAN_CFLAGS@
182 183
183AM_CFLAGS = @WIN32_CFLAGS@ 184AM_CFLAGS = @WIN32_CFLAGS@
184 185
@@ -210,6 +211,7 @@ engines/common/libevas_engine_common.la \
210@EINA_LIBS@ \ 211@EINA_LIBS@ \
211$(EVAS_STATIC_MODULE) \ 212$(EVAS_STATIC_MODULE) \
212$(EVAS_STATIC_LIBADD) \ 213$(EVAS_STATIC_LIBADD) \
214@PIXMAN_LIBS@ \
213-lm 215-lm
214 216
215libevas_la_DEPENDENCIES = \ 217libevas_la_DEPENDENCIES = \
diff --git a/legacy/evas/src/lib/cache/Makefile.am b/legacy/evas/src/lib/cache/Makefile.am
index b172b4a39e..d417262baf 100644
--- a/legacy/evas/src/lib/cache/Makefile.am
+++ b/legacy/evas/src/lib/cache/Makefile.am
@@ -10,7 +10,9 @@ AM_CPPFLAGS = -I. \
10 @WIN32_CPPFLAGS@ \ 10 @WIN32_CPPFLAGS@ \
11 @EVIL_CFLAGS@ \ 11 @EVIL_CFLAGS@ \
12 @FREETYPE_CFLAGS@ \ 12 @FREETYPE_CFLAGS@ \
13 @EINA_CFLAGS@ 13 @PIXMAN_CFLAGS@ \
14 @EINA_CFLAGS@ \
15 @PIXMAN_CFLAGS@
14 16
15noinst_LTLIBRARIES = libevas_cache.la 17noinst_LTLIBRARIES = libevas_cache.la
16libevas_cache_la_SOURCES = \ 18libevas_cache_la_SOURCES = \
diff --git a/legacy/evas/src/lib/canvas/Makefile.am b/legacy/evas/src/lib/canvas/Makefile.am
index b408ec28b4..3b62505c85 100644
--- a/legacy/evas/src/lib/canvas/Makefile.am
+++ b/legacy/evas/src/lib/canvas/Makefile.am
@@ -13,7 +13,8 @@ AM_CPPFLAGS = \
13@EET_CFLAGS@ \ 13@EET_CFLAGS@ \
14@FONTCONFIG_CFLAGS@ \ 14@FONTCONFIG_CFLAGS@ \
15@EINA_CFLAGS@ \ 15@EINA_CFLAGS@ \
16@EVIL_CFLAGS@ 16@EVIL_CFLAGS@ \
17@PIXMAN_CFLAGS@
17 18
18noinst_LTLIBRARIES = libevas_canvas.la 19noinst_LTLIBRARIES = libevas_canvas.la
19libevas_canvas_la_SOURCES = \ 20libevas_canvas_la_SOURCES = \
diff --git a/legacy/evas/src/lib/cserve/Makefile.am b/legacy/evas/src/lib/cserve/Makefile.am
index 5d33c81362..6ff6e2a51d 100644
--- a/legacy/evas/src/lib/cserve/Makefile.am
+++ b/legacy/evas/src/lib/cserve/Makefile.am
@@ -13,7 +13,8 @@ AM_CPPFLAGS = \
13@FRIBIDI_CFLAGS@ \ 13@FRIBIDI_CFLAGS@ \
14@EET_CFLAGS@ \ 14@EET_CFLAGS@ \
15@FONTCONFIG_CFLAGS@ \ 15@FONTCONFIG_CFLAGS@ \
16@pthread_cflags@ 16@pthread_cflags@ \
17@PIXMAN_CFLAGS@
17 18
18if EVAS_CSERVE 19if EVAS_CSERVE
19 20
diff --git a/legacy/evas/src/lib/engines/common/Makefile.am b/legacy/evas/src/lib/engines/common/Makefile.am
index 62b96aab6b..961b20fcfa 100644
--- a/legacy/evas/src/lib/engines/common/Makefile.am
+++ b/legacy/evas/src/lib/engines/common/Makefile.am
@@ -11,9 +11,11 @@ AM_CPPFLAGS = -I. \
11 -DPACKAGE_LIB_DIR=\"$(libdir)\" \ 11 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
12 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 12 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
13 @FREETYPE_CFLAGS@ @VALGRIND_CFLAGS@ \ 13 @FREETYPE_CFLAGS@ @VALGRIND_CFLAGS@ \
14 @PIXMAN_CFLAGS@ \
14 @EET_CFLAGS@ @pthread_cflags@ \ 15 @EET_CFLAGS@ @pthread_cflags@ \
15 @WIN32_CFLAGS@ @EINA_CFLAGS@ \ 16 @WIN32_CFLAGS@ @EINA_CFLAGS@ \
16 @FRIBIDI_CFLAGS@ @HARFBUZZ_CFLAGS@ 17 @FRIBIDI_CFLAGS@ @HARFBUZZ_CFLAGS@ \
18 @PIXMAN_CFLAGS@
17 19
18noinst_LTLIBRARIES = libevas_engine_common.la 20noinst_LTLIBRARIES = libevas_engine_common.la
19libevas_engine_common_la_SOURCES = \ 21libevas_engine_common_la_SOURCES = \
diff --git a/legacy/evas/src/lib/engines/common/evas_image_data.c b/legacy/evas/src/lib/engines/common/evas_image_data.c
index 15ee166fa2..e5c2f6d73b 100644
--- a/legacy/evas/src/lib/engines/common/evas_image_data.c
+++ b/legacy/evas/src/lib/engines/common/evas_image_data.c
@@ -31,6 +31,7 @@ evas_common_rgba_image_from_data(Image_Entry* ie_dst, int w, int h, DATA32 *imag
31 } 31 }
32 dst->cache_entry.space = cspace; 32 dst->cache_entry.space = cspace;
33 evas_common_image_colorspace_dirty(dst); 33 evas_common_image_colorspace_dirty(dst);
34 _evas_common_rgba_image_post_surface(ie_dst);
34 return 0; 35 return 0;
35} 36}
36 37
@@ -60,6 +61,7 @@ evas_common_rgba_image_from_copied_data(Image_Entry* ie_dst, int w, int h, DATA3
60 61
61 dst->cache_entry.space = cspace; 62 dst->cache_entry.space = cspace;
62 evas_common_image_colorspace_dirty(dst); 63 evas_common_image_colorspace_dirty(dst);
64 _evas_common_rgba_image_post_surface(ie_dst);
63 return 0; 65 return 0;
64} 66}
65 67
@@ -80,6 +82,7 @@ evas_common_rgba_image_size_set(Image_Entry *ie_dst, const Image_Entry *ie_im, u
80 dst->cs.data = calloc(1, dst->cache_entry.h * sizeof(unsigned char *) * 2); 82 dst->cs.data = calloc(1, dst->cache_entry.h * sizeof(unsigned char *) * 2);
81 evas_common_image_colorspace_dirty(dst); 83 evas_common_image_colorspace_dirty(dst);
82 84
85 _evas_common_rgba_image_post_surface(ie_dst);
83 return 0; 86 return 0;
84} 87}
85 88
@@ -126,5 +129,6 @@ evas_common_rgba_image_colorspace_set(Image_Entry* ie_dst, int cspace)
126 dst->cache_entry.space = cspace; 129 dst->cache_entry.space = cspace;
127 evas_common_image_colorspace_dirty(dst); 130 evas_common_image_colorspace_dirty(dst);
128 131
132 _evas_common_rgba_image_post_surface(ie_dst);
129 return 0; 133 return 0;
130} 134}
diff --git a/legacy/evas/src/lib/engines/common/evas_image_main.c b/legacy/evas/src/lib/engines/common/evas_image_main.c
index 03a06f2227..caf20a5f9c 100644
--- a/legacy/evas/src/lib/engines/common/evas_image_main.c
+++ b/legacy/evas/src/lib/engines/common/evas_image_main.c
@@ -144,6 +144,7 @@ _evas_common_rgba_image_new(void)
144#endif 144#endif
145 145
146 evas_common_rgba_image_scalecache_init(&im->cache_entry); 146 evas_common_rgba_image_scalecache_init(&im->cache_entry);
147
147 return &im->cache_entry; 148 return &im->cache_entry;
148} 149}
149 150
@@ -246,6 +247,42 @@ evas_common_rgba_image_unload(Image_Entry *ie)
246#endif 247#endif
247} 248}
248 249
250void
251_evas_common_rgba_image_post_surface(Image_Entry *ie)
252{
253#ifdef HAVE_PIXMAN
254 RGBA_Image *im = (RGBA_Image *) ie;
255
256 if (im->pixman.im) pixman_image_unref(im->pixman.im);
257 if (im->cache_entry.flags.alpha)
258 {
259 im->pixman.im = pixman_image_create_bits
260 (
261// FIXME: endianess determines this
262 PIXMAN_a8r8g8b8,
263// PIXMAN_b8g8r8a8,
264 im->cache_entry.w, im->cache_entry.h,
265 im->image.data,
266 im->cache_entry.w * 4
267 );
268 }
269 else
270 {
271 im->pixman.im = pixman_image_create_bits
272 (
273// FIXME: endianess determines this
274 PIXMAN_x8r8g8b8,
275// PIXMAN_b8g8r8x8,
276 im->cache_entry.w, im->cache_entry.h,
277 im->image.data,
278 im->cache_entry.w * 4
279 );
280 }
281#else
282 ie = NULL;
283#endif
284}
285
249static int 286static int
250_evas_common_rgba_image_surface_alloc(Image_Entry *ie, unsigned int w, unsigned int h) 287_evas_common_rgba_image_surface_alloc(Image_Entry *ie, unsigned int w, unsigned int h)
251{ 288{
@@ -275,7 +312,8 @@ _evas_common_rgba_image_surface_alloc(Image_Entry *ie, unsigned int w, unsigned
275# endif 312# endif
276# endif 313# endif
277#endif 314#endif
278 315 _evas_common_rgba_image_post_surface(ie);
316
279 return 0; 317 return 0;
280} 318}
281 319
@@ -284,6 +322,13 @@ _evas_common_rgba_image_surface_delete(Image_Entry *ie)
284{ 322{
285 RGBA_Image *im = (RGBA_Image *) ie; 323 RGBA_Image *im = (RGBA_Image *) ie;
286 324
325#ifdef HAVE_PIXMAN
326 if (im->pixman.im)
327 {
328 pixman_image_unref(im->pixman.im);
329 im->pixman.im = NULL;
330 }
331#endif
287 if (ie->file) 332 if (ie->file)
288 DBG("unload: [%p] %s %s", ie, ie->file, ie->key); 333 DBG("unload: [%p] %s %s", ie, ie->file, ie->key);
289 if ((im->cs.data) && (im->image.data)) 334 if ((im->cs.data) && (im->image.data))
diff --git a/legacy/evas/src/lib/engines/common/evas_image_private.h b/legacy/evas/src/lib/engines/common/evas_image_private.h
index d9aeea795d..cf613696fd 100644
--- a/legacy/evas/src/lib/engines/common/evas_image_private.h
+++ b/legacy/evas/src/lib/engines/common/evas_image_private.h
@@ -13,5 +13,7 @@ void evas_common_rgba_image_scalecache_shutdown(Image_Entry *ie);
13void evas_common_rgba_image_scalecache_dirty(Image_Entry *ie); 13void evas_common_rgba_image_scalecache_dirty(Image_Entry *ie);
14void evas_common_rgba_image_scalecache_orig_use(Image_Entry *ie); 14void evas_common_rgba_image_scalecache_orig_use(Image_Entry *ie);
15int evas_common_rgba_image_scalecache_usage_get(Image_Entry *ie); 15int evas_common_rgba_image_scalecache_usage_get(Image_Entry *ie);
16 16
17void _evas_common_rgba_image_post_surface(Image_Entry *ie);
18
17#endif /* _EVAS_IMAGE_PRIVATE_H */ 19#endif /* _EVAS_IMAGE_PRIVATE_H */
diff --git a/legacy/evas/src/lib/engines/common/evas_image_scalecache.c b/legacy/evas/src/lib/engines/common/evas_image_scalecache.c
index 63d4c47eb3..dc9ade6a19 100644
--- a/legacy/evas/src/lib/engines/common/evas_image_scalecache.c
+++ b/legacy/evas/src/lib/engines/common/evas_image_scalecache.c
@@ -518,18 +518,11 @@ evas_common_rgba_image_scalecache_do(Image_Entry *ie, RGBA_Image *dst,
518 LKU(im->cache.lock); 518 LKU(im->cache.lock);
519 if (im->image.data) 519 if (im->image.data)
520 { 520 {
521 if (smooth) 521 evas_common_scale_rgba_in_to_out_clip_sample(im, dst, dc,
522 evas_common_scale_rgba_in_to_out_clip_smooth(im, dst, dc, 522 src_region_x, src_region_y,
523 src_region_x, src_region_y, 523 src_region_w, src_region_h,
524 src_region_w, src_region_h, 524 dst_region_x, dst_region_y,
525 dst_region_x, dst_region_y, 525 dst_region_w, dst_region_h);
526 dst_region_w, dst_region_h);
527 else
528 evas_common_scale_rgba_in_to_out_clip_sample(im, dst, dc,
529 src_region_x, src_region_y,
530 src_region_w, src_region_h,
531 dst_region_x, dst_region_y,
532 dst_region_w, dst_region_h);
533 } 526 }
534 return; 527 return;
535 } 528 }
diff --git a/legacy/evas/src/lib/engines/common/evas_scale_sample.c b/legacy/evas/src/lib/engines/common/evas_scale_sample.c
index 9eefe14c4e..68d9e4990d 100644
--- a/legacy/evas/src/lib/engines/common/evas_scale_sample.c
+++ b/legacy/evas/src/lib/engines/common/evas_scale_sample.c
@@ -257,24 +257,48 @@ scale_rgba_in_to_out_clip_sample_internal(RGBA_Image *src, RGBA_Image *dst,
257 257
258 if ((dst_region_w == src_region_w) && (dst_region_h == src_region_h)) 258 if ((dst_region_w == src_region_w) && (dst_region_h == src_region_h))
259 { 259 {
260 ptr = src_data + ((dst_clip_y - dst_region_y + src_region_y) * src_w) + (dst_clip_x - dst_region_x) + src_region_x; 260#ifdef HAVE_PIXMAN
261 for (y = 0; y < dst_clip_h; y++) 261 if ((1) &&
262 { 262 (src->pixman.im) && (dst->pixman.im) &&
263 /* * blend here [clip_w *] ptr -> dst_ptr * */ 263 ((!dc->mul.use) ||
264 if (mask) 264 ((dc->mul.use) && (dc->mul.col == 0xffffffff))) &&
265 { 265 ((dc->render_op == _EVAS_RENDER_COPY) ||
266 mask += dst_clip_x - dc->mask.x; 266 (dc->render_op == _EVAS_RENDER_BLEND))
267 mask += (dst_clip_y - dc->mask.y) * maskobj->cache_entry.w; 267 )
268 } 268 {
269 pixman_op_t op = PIXMAN_OP_SRC; // _EVAS_RENDER_COPY
270 if (dc->render_op == _EVAS_RENDER_BLEND) op = PIXMAN_OP_OVER;
271 pixman_image_composite(op,
272 src->pixman.im, NULL,
273 dst->pixman.im,
274 (dst_clip_x - dst_region_x) + src_region_x,
275 (dst_clip_y - dst_region_y) + src_region_y,
276 0, 0,
277 dst_clip_x, dst_clip_y,
278 dst_clip_w, dst_clip_h);
279 }
280 else
281#endif
282 {
283 ptr = src_data + ((dst_clip_y - dst_region_y + src_region_y) * src_w) + (dst_clip_x - dst_region_x) + src_region_x;
284 for (y = 0; y < dst_clip_h; y++)
285 {
286 /* * blend here [clip_w *] ptr -> dst_ptr * */
287 if (mask)
288 {
289 mask += dst_clip_x - dc->mask.x;
290 mask += (dst_clip_y - dc->mask.y) * maskobj->cache_entry.w;
291 }
269#ifdef EVAS_SLI 292#ifdef EVAS_SLI
270 if (((y + dst_clip_y) % dc->sli.h) == dc->sli.y) 293 if (((y + dst_clip_y) % dc->sli.h) == dc->sli.y)
271#endif 294#endif
272 { 295 {
273 func(ptr, mask, dc->mul.col, dst_ptr, dst_clip_w); 296 func(ptr, mask, dc->mul.col, dst_ptr, dst_clip_w);
274 } 297 }
275 ptr += src_w; 298 ptr += src_w;
276 dst_ptr += dst_w; 299 dst_ptr += dst_w;
277 if (mask) mask += maskobj->cache_entry.w; 300 if (mask) mask += maskobj->cache_entry.w;
301 }
278 } 302 }
279 } 303 }
280 else 304 else
diff --git a/legacy/evas/src/lib/engines/common_16/Makefile.am b/legacy/evas/src/lib/engines/common_16/Makefile.am
index c7579fc99f..ef2ab305e4 100644
--- a/legacy/evas/src/lib/engines/common_16/Makefile.am
+++ b/legacy/evas/src/lib/engines/common_16/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
6-I$(top_srcdir)/src/lib \ 6-I$(top_srcdir)/src/lib \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8@FREETYPE_CFLAGS@ \ 8@FREETYPE_CFLAGS@ \
9@PIXMAN_CFLAGS@ \
9@VALGRIND_CFLAGS@ \ 10@VALGRIND_CFLAGS@ \
10@EINA_CFLAGS@ \ 11@EINA_CFLAGS@ \
11@EET_CFLAGS@ \ 12@EET_CFLAGS@ \
diff --git a/legacy/evas/src/lib/engines/common_8/Makefile.am b/legacy/evas/src/lib/engines/common_8/Makefile.am
index 5fdd086f97..58a1b1f8e2 100644
--- a/legacy/evas/src/lib/engines/common_8/Makefile.am
+++ b/legacy/evas/src/lib/engines/common_8/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
6-I$(top_srcdir)/src/lib \ 6-I$(top_srcdir)/src/lib \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8@FREETYPE_CFLAGS@ \ 8@FREETYPE_CFLAGS@ \
9@PIXMAN_CFLAGS@ \
9@VALGRIND_CFLAGS@ \ 10@VALGRIND_CFLAGS@ \
10@EINA_CFLAGS@ \ 11@EINA_CFLAGS@ \
11@EET_CFLAGS@ \ 12@EET_CFLAGS@ \
diff --git a/legacy/evas/src/lib/file/Makefile.am b/legacy/evas/src/lib/file/Makefile.am
index 8d0ee97517..7875fbe7e2 100644
--- a/legacy/evas/src/lib/file/Makefile.am
+++ b/legacy/evas/src/lib/file/Makefile.am
@@ -11,8 +11,9 @@ AM_CPPFLAGS = \
11@FREETYPE_CFLAGS@ \ 11@FREETYPE_CFLAGS@ \
12@EINA_CFLAGS@ \ 12@EINA_CFLAGS@ \
13@EVIL_CFLAGS@ \ 13@EVIL_CFLAGS@ \
14@WIN32_CPPFLAGS@ 14@WIN32_CPPFLAGS@ \
15 15@PIXMAN_CFLAGS@
16
16AM_CFLAGS = @WIN32_CFLAGS@ 17AM_CFLAGS = @WIN32_CFLAGS@
17 18
18noinst_LTLIBRARIES = libevas_file.la 19noinst_LTLIBRARIES = libevas_file.la
diff --git a/legacy/evas/src/lib/include/evas_common.h b/legacy/evas/src/lib/include/evas_common.h
index 74077d891a..7fa2b97489 100644
--- a/legacy/evas/src/lib/include/evas_common.h
+++ b/legacy/evas/src/lib/include/evas_common.h
@@ -13,6 +13,10 @@
13#include "Evas.h" 13#include "Evas.h"
14#include "Evas_GL.h" 14#include "Evas_GL.h"
15 15
16#ifdef HAVE_PIXMAN
17#include <pixman.h>
18#endif
19
16#include <sys/types.h> 20#include <sys/types.h>
17#include <sys/stat.h> 21#include <sys/stat.h>
18#include <unistd.h> 22#include <unistd.h>
@@ -819,6 +823,12 @@ struct _RGBA_Image
819 unsigned long long newest_usage; 823 unsigned long long newest_usage;
820 unsigned long long newest_usage_count; 824 unsigned long long newest_usage_count;
821 } cache; 825 } cache;
826
827#ifdef HAVE_PIXMAN
828 struct {
829 pixman_image_t *im;
830 } pixman;
831#endif
822}; 832};
823 833
824struct _RGBA_Polygon_Point 834struct _RGBA_Polygon_Point
diff --git a/legacy/evas/src/modules/engines/buffer/Makefile.am b/legacy/evas/src/modules/engines/buffer/Makefile.am
index aa02fc6089..19ac5a7d89 100644
--- a/legacy/evas/src/modules/engines/buffer/Makefile.am
+++ b/legacy/evas/src/modules/engines/buffer/Makefile.am
@@ -7,7 +7,8 @@ AM_CPPFLAGS = \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8-I$(top_srcdir)/src/modules/engines \ 8-I$(top_srcdir)/src/modules/engines \
9@EINA_CFLAGS@ \ 9@EINA_CFLAGS@ \
10@FREETYPE_CFLAGS@ 10@FREETYPE_CFLAGS@ \
11@PIXMAN_CFLAGS@
11 12
12AM_CFLAGS = @WIN32_CFLAGS@ 13AM_CFLAGS = @WIN32_CFLAGS@
13 14
diff --git a/legacy/evas/src/modules/engines/direct3d/Makefile.am b/legacy/evas/src/modules/engines/direct3d/Makefile.am
index 6b64ef5df3..cdbfd529fa 100644
--- a/legacy/evas/src/modules/engines/direct3d/Makefile.am
+++ b/legacy/evas/src/modules/engines/direct3d/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
8-I$(top_srcdir)/src/modules/engines \ 8-I$(top_srcdir)/src/modules/engines \
9@EINA_CFLAGS@ \ 9@EINA_CFLAGS@ \
10@FREETYPE_CFLAGS@ \ 10@FREETYPE_CFLAGS@ \
11@PIXMAN_CFLAGS@ \
11@evas_engine_direct3d_cflags@ 12@evas_engine_direct3d_cflags@
12 13
13if BUILD_ENGINE_DIRECT3D 14if BUILD_ENGINE_DIRECT3D
diff --git a/legacy/evas/src/modules/engines/directfb/Makefile.am b/legacy/evas/src/modules/engines/directfb/Makefile.am
index fae87daabf..5b00166bf4 100644
--- a/legacy/evas/src/modules/engines/directfb/Makefile.am
+++ b/legacy/evas/src/modules/engines/directfb/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8-I$(top_srcdir)/src/modules/engines \ 8-I$(top_srcdir)/src/modules/engines \
9@FREETYPE_CFLAGS@ \ 9@FREETYPE_CFLAGS@ \
10@PIXMAN_CFLAGS@ \
10@EINA_CFLAGS@ \ 11@EINA_CFLAGS@ \
11@evas_engine_directfb_cflags@ 12@evas_engine_directfb_cflags@
12 13
diff --git a/legacy/evas/src/modules/engines/fb/Makefile.am b/legacy/evas/src/modules/engines/fb/Makefile.am
index 47527f74e2..55127bb75a 100644
--- a/legacy/evas/src/modules/engines/fb/Makefile.am
+++ b/legacy/evas/src/modules/engines/fb/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8-I$(top_srcdir)/src/modules/engines \ 8-I$(top_srcdir)/src/modules/engines \
9@FREETYPE_CFLAGS@ \ 9@FREETYPE_CFLAGS@ \
10@PIXMAN_CFLAGS@ \
10@EINA_CFLAGS@ \ 11@EINA_CFLAGS@ \
11@evas_engine_fb_cflags@ 12@evas_engine_fb_cflags@
12 13
diff --git a/legacy/evas/src/modules/engines/gl_common/Makefile.am b/legacy/evas/src/modules/engines/gl_common/Makefile.am
index e0a0fbbed6..ac74f132f0 100644
--- a/legacy/evas/src/modules/engines/gl_common/Makefile.am
+++ b/legacy/evas/src/modules/engines/gl_common/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
6-I$(top_srcdir)/src/lib \ 6-I$(top_srcdir)/src/lib \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8@FREETYPE_CFLAGS@ \ 8@FREETYPE_CFLAGS@ \
9@PIXMAN_CFLAGS@ \
9@EINA_CFLAGS@ 10@EINA_CFLAGS@
10 11
11if BUILD_ENGINE_GL_COMMON 12if BUILD_ENGINE_GL_COMMON
diff --git a/legacy/evas/src/modules/engines/gl_sdl/Makefile.am b/legacy/evas/src/modules/engines/gl_sdl/Makefile.am
index 57da21b301..961bf412b1 100644
--- a/legacy/evas/src/modules/engines/gl_sdl/Makefile.am
+++ b/legacy/evas/src/modules/engines/gl_sdl/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8-I$(top_srcdir)/src/modules/engines/gl_common \ 8-I$(top_srcdir)/src/modules/engines/gl_common \
9@FREETYPE_CFLAGS@ \ 9@FREETYPE_CFLAGS@ \
10@PIXMAN_CFLAGS@ \
10@EINA_CFLAGS@ \ 11@EINA_CFLAGS@ \
11@evas_engine_gl_sdl_cflags@ 12@evas_engine_gl_sdl_cflags@
12 13
diff --git a/legacy/evas/src/modules/engines/gl_x11/Makefile.am b/legacy/evas/src/modules/engines/gl_x11/Makefile.am
index 91cd0d46e3..3701a0dd05 100644
--- a/legacy/evas/src/modules/engines/gl_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/gl_x11/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8-I$(top_srcdir)/src/modules/engines/gl_common \ 8-I$(top_srcdir)/src/modules/engines/gl_common \
9@FREETYPE_CFLAGS@ \ 9@FREETYPE_CFLAGS@ \
10@PIXMAN_CFLAGS@ \
10@EINA_CFLAGS@ \ 11@EINA_CFLAGS@ \
11@evas_engine_gl_x11_cflags@ 12@evas_engine_gl_x11_cflags@
12 13
diff --git a/legacy/evas/src/modules/engines/software_16/Makefile.am b/legacy/evas/src/modules/engines/software_16/Makefile.am
index 1735d7b1ec..070d6104fc 100644
--- a/legacy/evas/src/modules/engines/software_16/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_16/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8-I$(top_srcdir)/src/modules/engines \ 8-I$(top_srcdir)/src/modules/engines \
9@FREETYPE_CFLAGS@ \ 9@FREETYPE_CFLAGS@ \
10@PIXMAN_CFLAGS@ \
10@EINA_CFLAGS@ 11@EINA_CFLAGS@
11 12
12AM_CFLAGS = @WIN32_CFLAGS@ 13AM_CFLAGS = @WIN32_CFLAGS@
diff --git a/legacy/evas/src/modules/engines/software_16_ddraw/Makefile.am b/legacy/evas/src/modules/engines/software_16_ddraw/Makefile.am
index d32019e8b9..adbf477c8b 100644
--- a/legacy/evas/src/modules/engines/software_16_ddraw/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_16_ddraw/Makefile.am
@@ -9,6 +9,7 @@ AM_CPPFLAGS = \
9-I$(top_srcdir)/src/modules/engines/software_16 \ 9-I$(top_srcdir)/src/modules/engines/software_16 \
10@EINA_CFLAGS@ \ 10@EINA_CFLAGS@ \
11@FREETYPE_CFLAGS@ \ 11@FREETYPE_CFLAGS@ \
12@PIXMAN_CFLAGS@ \
12@evas_engine_software_16_ddraw_cflags@ 13@evas_engine_software_16_ddraw_cflags@
13 14
14if BUILD_ENGINE_SOFTWARE_16_DDRAW 15if BUILD_ENGINE_SOFTWARE_16_DDRAW
diff --git a/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am b/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am
index 5a8dc2f820..af0197d33c 100644
--- a/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
2 2
3MAINTAINERCLEANFILES = Makefile.in 3MAINTAINERCLEANFILES = Makefile.in
4 4
5INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @FREETYPE_CFLAGS@ @SDL_CFLAGS@ @EINA_CFLAGS@ 5INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @FREETYPE_CFLAGS@ @PIXMAN_CFLAGS@ @SDL_CFLAGS@ @EINA_CFLAGS@
6 6
7if BUILD_ENGINE_SOFTWARE_SDL 7if BUILD_ENGINE_SOFTWARE_SDL
8 8
diff --git a/legacy/evas/src/modules/engines/software_16_wince/Makefile.am b/legacy/evas/src/modules/engines/software_16_wince/Makefile.am
index d7e39b4dcd..7f0c66670b 100644
--- a/legacy/evas/src/modules/engines/software_16_wince/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_16_wince/Makefile.am
@@ -9,6 +9,7 @@ AM_CPPFLAGS = \
9-I$(top_srcdir)/src/modules/engines/software_16 \ 9-I$(top_srcdir)/src/modules/engines/software_16 \
10@EINA_CFLAGS@ \ 10@EINA_CFLAGS@ \
11@FREETYPE_CFLAGS@ \ 11@FREETYPE_CFLAGS@ \
12@PIXMAN_CFLAGS@ \
12@evas_engine_software_16_wince_cflags@ 13@evas_engine_software_16_wince_cflags@
13 14
14if BUILD_ENGINE_SOFTWARE_16_WINCE 15if BUILD_ENGINE_SOFTWARE_16_WINCE
diff --git a/legacy/evas/src/modules/engines/software_16_x11/Makefile.am b/legacy/evas/src/modules/engines/software_16_x11/Makefile.am
index dc2458440f..812492e61c 100644
--- a/legacy/evas/src/modules/engines/software_16_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_16_x11/Makefile.am
@@ -9,6 +9,7 @@ AM_CPPFLAGS = \
9-I$(top_srcdir)/src/modules/engines/software_16 \ 9-I$(top_srcdir)/src/modules/engines/software_16 \
10@FREETYPE_CFLAGS@ \ 10@FREETYPE_CFLAGS@ \
11@EINA_CFLAGS@ \ 11@EINA_CFLAGS@ \
12@PIXMAN_CFLAGS@ \
12@evas_engine_software_16_x11_cflags@ 13@evas_engine_software_16_x11_cflags@
13 14
14if BUILD_ENGINE_SOFTWARE_16_X11 15if BUILD_ENGINE_SOFTWARE_16_X11
diff --git a/legacy/evas/src/modules/engines/software_8/Makefile.am b/legacy/evas/src/modules/engines/software_8/Makefile.am
index 4c48018792..145b766b61 100644
--- a/legacy/evas/src/modules/engines/software_8/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_8/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8-I$(top_srcdir)/src/modules/engines \ 8-I$(top_srcdir)/src/modules/engines \
9@FREETYPE_CFLAGS@ \ 9@FREETYPE_CFLAGS@ \
10@PIXMAN_CFLAGS@ \
10@EINA_CFLAGS@ 11@EINA_CFLAGS@
11 12
12AM_CFLAGS = @WIN32_CFLAGS@ 13AM_CFLAGS = @WIN32_CFLAGS@
diff --git a/legacy/evas/src/modules/engines/software_8_x11/Makefile.am b/legacy/evas/src/modules/engines/software_8_x11/Makefile.am
index bfb2b9b760..36895772dc 100644
--- a/legacy/evas/src/modules/engines/software_8_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_8_x11/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
8-I$(top_srcdir)/src/modules/engines \ 8-I$(top_srcdir)/src/modules/engines \
9-I$(top_srcdir)/src/modules/engines/software_8 \ 9-I$(top_srcdir)/src/modules/engines/software_8 \
10@FREETYPE_CFLAGS@ \ 10@FREETYPE_CFLAGS@ \
11@PIXMAN_CFLAGS@ \
11@EINA_CFLAGS@ \ 12@EINA_CFLAGS@ \
12@evas_engine_software_8_x11_cflags@ \ 13@evas_engine_software_8_x11_cflags@ \
13-I/usr/include/pixman-1 14-I/usr/include/pixman-1
diff --git a/legacy/evas/src/modules/engines/software_ddraw/Makefile.am b/legacy/evas/src/modules/engines/software_ddraw/Makefile.am
index 7a5856e0d3..594c7ab689 100644
--- a/legacy/evas/src/modules/engines/software_ddraw/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_ddraw/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
8-I$(top_srcdir)/src/modules/engines \ 8-I$(top_srcdir)/src/modules/engines \
9@EINA_CFLAGS@ \ 9@EINA_CFLAGS@ \
10@FREETYPE_CFLAGS@ \ 10@FREETYPE_CFLAGS@ \
11@PIXMAN_CFLAGS@ \
11@evas_engine_software_ddraw_cflags@ 12@evas_engine_software_ddraw_cflags@
12 13
13if BUILD_ENGINE_SOFTWARE_DDRAW 14if BUILD_ENGINE_SOFTWARE_DDRAW
diff --git a/legacy/evas/src/modules/engines/software_gdi/Makefile.am b/legacy/evas/src/modules/engines/software_gdi/Makefile.am
index 02a60c0869..ccb8084c0c 100644
--- a/legacy/evas/src/modules/engines/software_gdi/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_gdi/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
8-I$(top_srcdir)/src/modules/engines \ 8-I$(top_srcdir)/src/modules/engines \
9@EINA_CFLAGS@ \ 9@EINA_CFLAGS@ \
10@FREETYPE_CFLAGS@ \ 10@FREETYPE_CFLAGS@ \
11@PIXMAN_CFLAGS@ \
11@evas_engine_software_gdi_cflags@ 12@evas_engine_software_gdi_cflags@
12 13
13if BUILD_ENGINE_SOFTWARE_GDI 14if BUILD_ENGINE_SOFTWARE_GDI
diff --git a/legacy/evas/src/modules/engines/software_generic/Makefile.am b/legacy/evas/src/modules/engines/software_generic/Makefile.am
index 8278969a9a..d7986f1db4 100644
--- a/legacy/evas/src/modules/engines/software_generic/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_generic/Makefile.am
@@ -7,7 +7,8 @@ AM_CPPFLAGS = \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8-I$(top_srcdir)/src/modules/engines \ 8-I$(top_srcdir)/src/modules/engines \
9@EINA_CFLAGS@ \ 9@EINA_CFLAGS@ \
10@FREETYPE_CFLAGS@ 10@FREETYPE_CFLAGS@ \
11@PIXMAN_CFLAGS@
11 12
12AM_CFLAGS = @WIN32_CFLAGS@ 13AM_CFLAGS = @WIN32_CFLAGS@
13 14
diff --git a/legacy/evas/src/modules/engines/software_sdl/Makefile.am b/legacy/evas/src/modules/engines/software_sdl/Makefile.am
index 57892f643b..dc548bab0a 100644
--- a/legacy/evas/src/modules/engines/software_sdl/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_sdl/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8-I$(top_srcdir)/src/modules/engines \ 8-I$(top_srcdir)/src/modules/engines \
9@FREETYPE_CFLAGS@ \ 9@FREETYPE_CFLAGS@ \
10@PIXMAN_CFLAGS@ \
10@EINA_CFLAGS@ \ 11@EINA_CFLAGS@ \
11@evas_engine_software_sdl_cflags@ 12@evas_engine_software_sdl_cflags@
12 13
diff --git a/legacy/evas/src/modules/engines/software_x11/Makefile.am b/legacy/evas/src/modules/engines/software_x11/Makefile.am
index 86960b779c..675c6cdb8e 100644
--- a/legacy/evas/src/modules/engines/software_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_x11/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8-I$(top_srcdir)/src/modules/engines \ 8-I$(top_srcdir)/src/modules/engines \
9@FREETYPE_CFLAGS@ \ 9@FREETYPE_CFLAGS@ \
10@PIXMAN_CFLAGS@ \
10@EINA_CFLAGS@ \ 11@EINA_CFLAGS@ \
11@evas_engine_software_xlib_cflags@ \ 12@evas_engine_software_xlib_cflags@ \
12@evas_engine_software_xcb_cflags@ 13@evas_engine_software_xcb_cflags@
diff --git a/legacy/evas/src/modules/loaders/bmp/Makefile.am b/legacy/evas/src/modules/loaders/bmp/Makefile.am
index 430156afc5..857f3b95c6 100644
--- a/legacy/evas/src/modules/loaders/bmp/Makefile.am
+++ b/legacy/evas/src/modules/loaders/bmp/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
6-I$(top_srcdir)/src/lib \ 6-I$(top_srcdir)/src/lib \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8@FREETYPE_CFLAGS@ \ 8@FREETYPE_CFLAGS@ \
9@PIXMAN_CFLAGS@ \
9@EINA_CFLAGS@ \ 10@EINA_CFLAGS@ \
10@EVIL_CFLAGS@ \ 11@EVIL_CFLAGS@ \
11@WIN32_CPPFLAGS@ 12@WIN32_CPPFLAGS@
diff --git a/legacy/evas/src/modules/loaders/edb/Makefile.am b/legacy/evas/src/modules/loaders/edb/Makefile.am
index bdb212793f..a0baf6baff 100644
--- a/legacy/evas/src/modules/loaders/edb/Makefile.am
+++ b/legacy/evas/src/modules/loaders/edb/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
6-I$(top_srcdir)/src/lib \ 6-I$(top_srcdir)/src/lib \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8@FREETYPE_CFLAGS@ \ 8@FREETYPE_CFLAGS@ \
9@PIXMAN_CFLAGS@ \
9@evas_image_loader_edb_cflags@ \ 10@evas_image_loader_edb_cflags@ \
10@EINA_CFLAGS@ 11@EINA_CFLAGS@
11 12
diff --git a/legacy/evas/src/modules/loaders/eet/Makefile.am b/legacy/evas/src/modules/loaders/eet/Makefile.am
index 39b2f0be4f..c96a8d3197 100644
--- a/legacy/evas/src/modules/loaders/eet/Makefile.am
+++ b/legacy/evas/src/modules/loaders/eet/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
6-I$(top_srcdir)/src/lib \ 6-I$(top_srcdir)/src/lib \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8@FREETYPE_CFLAGS@ \ 8@FREETYPE_CFLAGS@ \
9@PIXMAN_CFLAGS@ \
9@evas_image_loader_eet_cflags@ \ 10@evas_image_loader_eet_cflags@ \
10@EINA_CFLAGS@ 11@EINA_CFLAGS@
11 12
diff --git a/legacy/evas/src/modules/loaders/gif/Makefile.am b/legacy/evas/src/modules/loaders/gif/Makefile.am
index 6e3a442597..923437021d 100644
--- a/legacy/evas/src/modules/loaders/gif/Makefile.am
+++ b/legacy/evas/src/modules/loaders/gif/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
6-I$(top_srcdir)/src/lib \ 6-I$(top_srcdir)/src/lib \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8@FREETYPE_CFLAGS@ \ 8@FREETYPE_CFLAGS@ \
9@PIXMAN_CFLAGS@ \
9@evas_image_loader_gif_cflags@ \ 10@evas_image_loader_gif_cflags@ \
10@EINA_CFLAGS@ 11@EINA_CFLAGS@
11 12
diff --git a/legacy/evas/src/modules/loaders/ico/Makefile.am b/legacy/evas/src/modules/loaders/ico/Makefile.am
index c06866d50c..044dd0d640 100644
--- a/legacy/evas/src/modules/loaders/ico/Makefile.am
+++ b/legacy/evas/src/modules/loaders/ico/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
6-I$(top_srcdir)/src/lib \ 6-I$(top_srcdir)/src/lib \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8@FREETYPE_CFLAGS@ \ 8@FREETYPE_CFLAGS@ \
9@PIXMAN_CFLAGS@ \
9@EINA_CFLAGS@ \ 10@EINA_CFLAGS@ \
10@EVIL_CFLAGS@ \ 11@EVIL_CFLAGS@ \
11@WIN32_CPPFLAGS@ 12@WIN32_CPPFLAGS@
diff --git a/legacy/evas/src/modules/loaders/jpeg/Makefile.am b/legacy/evas/src/modules/loaders/jpeg/Makefile.am
index ffeb2ac363..2088ba87f8 100644
--- a/legacy/evas/src/modules/loaders/jpeg/Makefile.am
+++ b/legacy/evas/src/modules/loaders/jpeg/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
6-I$(top_srcdir)/src/lib \ 6-I$(top_srcdir)/src/lib \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8@FREETYPE_CFLAGS@ \ 8@FREETYPE_CFLAGS@ \
9@PIXMAN_CFLAGS@ \
9@EINA_CFLAGS@ \ 10@EINA_CFLAGS@ \
10@evas_image_loader_jpeg_cflags@ \ 11@evas_image_loader_jpeg_cflags@ \
11@EVIL_CFLAGS@ \ 12@EVIL_CFLAGS@ \
diff --git a/legacy/evas/src/modules/loaders/pmaps/Makefile.am b/legacy/evas/src/modules/loaders/pmaps/Makefile.am
index 63549907f4..dc07a3221f 100644
--- a/legacy/evas/src/modules/loaders/pmaps/Makefile.am
+++ b/legacy/evas/src/modules/loaders/pmaps/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
6-I$(top_srcdir)/src/lib \ 6-I$(top_srcdir)/src/lib \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8@FREETYPE_CFLAGS@ \ 8@FREETYPE_CFLAGS@ \
9@PIXMAN_CFLAGS@ \
9@EINA_CFLAGS@ \ 10@EINA_CFLAGS@ \
10@evas_image_loader_pmaps_cflags@ \ 11@evas_image_loader_pmaps_cflags@ \
11@EVIL_CFLAGS@ \ 12@EVIL_CFLAGS@ \
diff --git a/legacy/evas/src/modules/loaders/png/Makefile.am b/legacy/evas/src/modules/loaders/png/Makefile.am
index ff14bb874d..f9387a593e 100644
--- a/legacy/evas/src/modules/loaders/png/Makefile.am
+++ b/legacy/evas/src/modules/loaders/png/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
6-I$(top_srcdir)/src/lib \ 6-I$(top_srcdir)/src/lib \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8@FREETYPE_CFLAGS@ \ 8@FREETYPE_CFLAGS@ \
9@PIXMAN_CFLAGS@ \
9@EINA_CFLAGS@ \ 10@EINA_CFLAGS@ \
10@evas_image_loader_png_cflags@ \ 11@evas_image_loader_png_cflags@ \
11@EVIL_CFLAGS@ \ 12@EVIL_CFLAGS@ \
diff --git a/legacy/evas/src/modules/loaders/svg/Makefile.am b/legacy/evas/src/modules/loaders/svg/Makefile.am
index d8e60daa2a..4b8d1b53a4 100644
--- a/legacy/evas/src/modules/loaders/svg/Makefile.am
+++ b/legacy/evas/src/modules/loaders/svg/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
6-I$(top_srcdir)/src/lib \ 6-I$(top_srcdir)/src/lib \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8@FREETYPE_CFLAGS@ \ 8@FREETYPE_CFLAGS@ \
9@PIXMAN_CFLAGS@ \
9@EINA_CFLAGS@ \ 10@EINA_CFLAGS@ \
10@evas_image_loader_svg_cflags@ 11@evas_image_loader_svg_cflags@
11 12
diff --git a/legacy/evas/src/modules/loaders/tga/Makefile.am b/legacy/evas/src/modules/loaders/tga/Makefile.am
index f784d63a68..4d9e240c97 100644
--- a/legacy/evas/src/modules/loaders/tga/Makefile.am
+++ b/legacy/evas/src/modules/loaders/tga/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
6-I$(top_srcdir)/src/lib \ 6-I$(top_srcdir)/src/lib \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8@FREETYPE_CFLAGS@ \ 8@FREETYPE_CFLAGS@ \
9@PIXMAN_CFLAGS@ \
9@EINA_CFLAGS@ \ 10@EINA_CFLAGS@ \
10@EVIL_CFLAGS@ \ 11@EVIL_CFLAGS@ \
11@WIN32_CPPFLAGS@ 12@WIN32_CPPFLAGS@
diff --git a/legacy/evas/src/modules/loaders/tiff/Makefile.am b/legacy/evas/src/modules/loaders/tiff/Makefile.am
index b1aa818ae1..f617c5e8a4 100644
--- a/legacy/evas/src/modules/loaders/tiff/Makefile.am
+++ b/legacy/evas/src/modules/loaders/tiff/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
6-I$(top_srcdir)/src/lib \ 6-I$(top_srcdir)/src/lib \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8@FREETYPE_CFLAGS@ \ 8@FREETYPE_CFLAGS@ \
9@PIXMAN_CFLAGS@ \
9@EINA_CFLAGS@ \ 10@EINA_CFLAGS@ \
10@evas_image_loader_tiff_cflags@ \ 11@evas_image_loader_tiff_cflags@ \
11@EVIL_CFLAGS@ \ 12@EVIL_CFLAGS@ \
diff --git a/legacy/evas/src/modules/loaders/wbmp/Makefile.am b/legacy/evas/src/modules/loaders/wbmp/Makefile.am
index 577d42e4e9..eed287a2a7 100644
--- a/legacy/evas/src/modules/loaders/wbmp/Makefile.am
+++ b/legacy/evas/src/modules/loaders/wbmp/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
6-I$(top_srcdir)/src/lib \ 6-I$(top_srcdir)/src/lib \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8@FREETYPE_CFLAGS@ \ 8@FREETYPE_CFLAGS@ \
9@PIXMAN_CFLAGS@ \
9@EINA_CFLAGS@ \ 10@EINA_CFLAGS@ \
10@EVIL_CFLAGS@ \ 11@EVIL_CFLAGS@ \
11@WIN32_CPPFLAGS@ 12@WIN32_CPPFLAGS@
diff --git a/legacy/evas/src/modules/loaders/xpm/Makefile.am b/legacy/evas/src/modules/loaders/xpm/Makefile.am
index de81294df8..b8cb1faebe 100644
--- a/legacy/evas/src/modules/loaders/xpm/Makefile.am
+++ b/legacy/evas/src/modules/loaders/xpm/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
6-I$(top_srcdir)/src/lib \ 6-I$(top_srcdir)/src/lib \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8@FREETYPE_CFLAGS@ \ 8@FREETYPE_CFLAGS@ \
9@PIXMAN_CFLAGS@ \
9@EINA_CFLAGS@ \ 10@EINA_CFLAGS@ \
10@evas_image_loader_xpm_cflags@ \ 11@evas_image_loader_xpm_cflags@ \
11@EVIL_CFLAGS@ \ 12@EVIL_CFLAGS@ \
diff --git a/legacy/evas/src/modules/savers/edb/Makefile.am b/legacy/evas/src/modules/savers/edb/Makefile.am
index e273d9b0e5..4614cec64a 100644
--- a/legacy/evas/src/modules/savers/edb/Makefile.am
+++ b/legacy/evas/src/modules/savers/edb/Makefile.am
@@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in
4AM_CPPFLAGS = -I. \ 4AM_CPPFLAGS = -I. \
5 -I$(top_srcdir)/src/lib \ 5 -I$(top_srcdir)/src/lib \
6 -I$(top_srcdir)/src/lib/include \ 6 -I$(top_srcdir)/src/lib/include \
7 @FREETYPE_CFLAGS@ @evas_image_loader_edb_cflags@ \ 7 @FREETYPE_CFLAGS@ @PIXMAN_CFLAGS@ @evas_image_loader_edb_cflags@ \
8 @EINA_CFLAGS@ 8 @EINA_CFLAGS@
9 9
10if BUILD_LOADER_EDB 10if BUILD_LOADER_EDB
diff --git a/legacy/evas/src/modules/savers/eet/Makefile.am b/legacy/evas/src/modules/savers/eet/Makefile.am
index 94f3a55c73..1c7f71c871 100644
--- a/legacy/evas/src/modules/savers/eet/Makefile.am
+++ b/legacy/evas/src/modules/savers/eet/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
6-I$(top_srcdir)/src/lib \ 6-I$(top_srcdir)/src/lib \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8@FREETYPE_CFLAGS@ \ 8@FREETYPE_CFLAGS@ \
9@PIXMAN_CFLAGS@ \
9@EINA_CFLAGS@ \ 10@EINA_CFLAGS@ \
10@evas_image_loader_eet_cflags@ 11@evas_image_loader_eet_cflags@
11 12
diff --git a/legacy/evas/src/modules/savers/jpeg/Makefile.am b/legacy/evas/src/modules/savers/jpeg/Makefile.am
index 7d86faac8e..82a40acdd3 100644
--- a/legacy/evas/src/modules/savers/jpeg/Makefile.am
+++ b/legacy/evas/src/modules/savers/jpeg/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS= \
6-I$(top_srcdir)/src/lib \ 6-I$(top_srcdir)/src/lib \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8@FREETYPE_CFLAGS@ \ 8@FREETYPE_CFLAGS@ \
9@PIXMAN_CFLAGS@ \
9@EINA_CFLAGS@ \ 10@EINA_CFLAGS@ \
10@evas_image_loader_jpeg_cflags@ 11@evas_image_loader_jpeg_cflags@
11 12
diff --git a/legacy/evas/src/modules/savers/png/Makefile.am b/legacy/evas/src/modules/savers/png/Makefile.am
index b9d9cd557c..1429f2e853 100644
--- a/legacy/evas/src/modules/savers/png/Makefile.am
+++ b/legacy/evas/src/modules/savers/png/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
6-I$(top_srcdir)/src/lib \ 6-I$(top_srcdir)/src/lib \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8@FREETYPE_CFLAGS@ \ 8@FREETYPE_CFLAGS@ \
9@PIXMAN_CFLAGS@ \
9@EINA_CFLAGS@ \ 10@EINA_CFLAGS@ \
10@evas_image_loader_png_cflags@ \ 11@evas_image_loader_png_cflags@ \
11@EVIL_CFLAGS@ \ 12@EVIL_CFLAGS@ \
diff --git a/legacy/evas/src/modules/savers/tiff/Makefile.am b/legacy/evas/src/modules/savers/tiff/Makefile.am
index c754c0b927..6d58d26278 100644
--- a/legacy/evas/src/modules/savers/tiff/Makefile.am
+++ b/legacy/evas/src/modules/savers/tiff/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
6-I$(top_srcdir)/src/lib \ 6-I$(top_srcdir)/src/lib \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8@FREETYPE_CFLAGS@ \ 8@FREETYPE_CFLAGS@ \
9@PIXMAN_CFLAGS@ \
9@EINA_CFLAGS@ \ 10@EINA_CFLAGS@ \
10@evas_image_loader_tiff_cflags@ 11@evas_image_loader_tiff_cflags@
11 12