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.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@58824 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/configure.ac b/configure.ac
index af82b91..72f5089 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -90,6 +90,7 @@ AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
 want_fontconfig="auto"
 want_fribidi="auto"
 want_harfbuzz="auto"
+want_pixman="no"
 want_evas_cserve="yes"
 
 want_evas_engine_buffer="yes"
@@ -359,6 +360,35 @@ if test "x${have_harfbuzz}" = "xno"; then
   HAS_HARFBUZZ=0
 fi
 
+# Pixman
+have_pixman="no"
+AC_ARG_ENABLE([pixman],
+   AC_HELP_STRING([--disable-pixman],
+      [disable pixman for software rendering. @<:@default=enabled@:>@]),
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_pixman="yes"
+    else
+       want_pixman="no"
+    fi
+   ])
+
+
+if test "x${want_pixman}" = "xyes" -o "x${want_pixman}" = "xauto" ; then
+   PKG_CHECK_MODULES([PIXMAN],
+      [pixman-1],
+      [
+       have_pixman="yes"
+       AC_DEFINE(HAVE_PIXMAN, 1, [have pixman for rendering])
+       requirement_evas="pixman-1 ${requirement_evas}"
+      ],
+      [
+       if test "x${want_pixman}" = "xyes" -a "x${use_strict}" = "xyes" ; then
+          AC_MSG_ERROR([Pixman not found (strict dependencies checking)])
+       fi
+      ])
+fi
+
 ### Checks for header files
 AC_HEADER_STDC
 AC_CHECK_HEADERS([unistd.h stdint.h sys/param.h])

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index b8ad015..987e14b 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -15,7 +15,8 @@ AM_CPPFLAGS = \
 @FRIBIDI_CFLAGS@ \
 @EET_CFLAGS@ \
 @FONTCONFIG_CFLAGS@ \
-@pthread_cflags@
+@pthread_cflags@ \
+@PIXMAN_CFLAGS@
 
 AM_CFLAGS = @WIN32_CFLAGS@
 

diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 746146d..ee5114d 100644 (file)
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -13,6 +13,7 @@ AM_CPPFLAGS = \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
 @EINA_CFLAGS@ \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @FRIBIDI_CFLAGS@ \
 @EET_CFLAGS@ \
 @FONTCONFIG_CFLAGS@ \

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index f2f6041..6e44840 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -178,7 +178,8 @@ AM_CPPFLAGS = \
 @HARFBUZZ_CFLAGS@ \
 @EET_CFLAGS@ \
 @FONTCONFIG_CFLAGS@ \
-@pthread_cflags@
+@pthread_cflags@ \
+@PIXMAN_CFLAGS@
 
 AM_CFLAGS = @WIN32_CFLAGS@
 
@@ -210,6 +211,7 @@ engines/common/libevas_engine_common.la \
 @EINA_LIBS@ \
 $(EVAS_STATIC_MODULE) \
 $(EVAS_STATIC_LIBADD) \
+@PIXMAN_LIBS@ \
 -lm
 
 libevas_la_DEPENDENCIES = \

diff --git a/src/lib/cache/Makefile.am b/src/lib/cache/Makefile.am
index b172b4a..d417262 100644 (file)
--- a/src/lib/cache/Makefile.am
+++ b/src/lib/cache/Makefile.am
@@ -10,7 +10,9 @@ AM_CPPFLAGS        = -I. \
                        @WIN32_CPPFLAGS@ \
                        @EVIL_CFLAGS@ \
                       @FREETYPE_CFLAGS@ \
-                      @EINA_CFLAGS@
+                       @PIXMAN_CFLAGS@ \
+                      @EINA_CFLAGS@ \
+                       @PIXMAN_CFLAGS@
 
 noinst_LTLIBRARIES      = libevas_cache.la
 libevas_cache_la_SOURCES  = \

diff --git a/src/lib/canvas/Makefile.am b/src/lib/canvas/Makefile.am
index b408ec2..3b62505 100644 (file)
--- a/src/lib/canvas/Makefile.am
+++ b/src/lib/canvas/Makefile.am
@@ -13,7 +13,8 @@ AM_CPPFLAGS = \
 @EET_CFLAGS@ \
 @FONTCONFIG_CFLAGS@ \
 @EINA_CFLAGS@ \
-@EVIL_CFLAGS@
+@EVIL_CFLAGS@ \
+@PIXMAN_CFLAGS@
 
 noinst_LTLIBRARIES   = libevas_canvas.la
 libevas_canvas_la_SOURCES  = \

diff --git a/src/lib/cserve/Makefile.am b/src/lib/cserve/Makefile.am
index 5d33c81..6ff6e2a 100644 (file)
--- a/src/lib/cserve/Makefile.am
+++ b/src/lib/cserve/Makefile.am
@@ -13,7 +13,8 @@ AM_CPPFLAGS = \
 @FRIBIDI_CFLAGS@ \
 @EET_CFLAGS@ \
 @FONTCONFIG_CFLAGS@ \
-@pthread_cflags@
+@pthread_cflags@ \
+@PIXMAN_CFLAGS@
 
 if EVAS_CSERVE
 

diff --git a/src/lib/engines/common/Makefile.am b/src/lib/engines/common/Makefile.am
index 62b96aa..961b20f 100644 (file)
--- a/src/lib/engines/common/Makefile.am
+++ b/src/lib/engines/common/Makefile.am
@@ -11,9 +11,11 @@ AM_CPPFLAGS       = -I. \
                       -DPACKAGE_LIB_DIR=\"$(libdir)\" \
                       -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
                       @FREETYPE_CFLAGS@ @VALGRIND_CFLAGS@ \
+                       @PIXMAN_CFLAGS@ \
                       @EET_CFLAGS@ @pthread_cflags@ \
                       @WIN32_CFLAGS@ @EINA_CFLAGS@ \
-                       @FRIBIDI_CFLAGS@ @HARFBUZZ_CFLAGS@
+                       @FRIBIDI_CFLAGS@ @HARFBUZZ_CFLAGS@ \
+                       @PIXMAN_CFLAGS@
 
 noinst_LTLIBRARIES      = libevas_engine_common.la
 libevas_engine_common_la_SOURCES  = \

diff --git a/src/lib/engines/common/evas_image_data.c b/src/lib/engines/common/evas_image_data.c
index 15ee166..e5c2f6d 100644 (file)
--- a/src/lib/engines/common/evas_image_data.c
+++ b/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
      }
    dst->cache_entry.space = cspace;
    evas_common_image_colorspace_dirty(dst);
+   _evas_common_rgba_image_post_surface(ie_dst);
    return 0;
 }
 
@@ -60,6 +61,7 @@ evas_common_rgba_image_from_copied_data(Image_Entry* ie_dst, int w, int h, DATA3
 
    dst->cache_entry.space = cspace;
    evas_common_image_colorspace_dirty(dst);
+   _evas_common_rgba_image_post_surface(ie_dst);
    return 0;
 }
 
@@ -80,6 +82,7 @@ evas_common_rgba_image_size_set(Image_Entry *ie_dst, const Image_Entry *ie_im, u
      dst->cs.data = calloc(1, dst->cache_entry.h * sizeof(unsigned char *) * 2);
    evas_common_image_colorspace_dirty(dst);
 
+   _evas_common_rgba_image_post_surface(ie_dst);
    return 0;
 }
 
@@ -126,5 +129,6 @@ evas_common_rgba_image_colorspace_set(Image_Entry* ie_dst, int cspace)
    dst->cache_entry.space = cspace;
    evas_common_image_colorspace_dirty(dst);
 
+   _evas_common_rgba_image_post_surface(ie_dst);
    return 0;
 }

diff --git a/src/lib/engines/common/evas_image_main.c b/src/lib/engines/common/evas_image_main.c
index 03a06f2..caf20a5 100644 (file)
--- a/src/lib/engines/common/evas_image_main.c
+++ b/src/lib/engines/common/evas_image_main.c
@@ -144,6 +144,7 @@ _evas_common_rgba_image_new(void)
 #endif
 
    evas_common_rgba_image_scalecache_init(&im->cache_entry);
+   
    return &im->cache_entry;
 }
 
@@ -246,6 +247,42 @@ evas_common_rgba_image_unload(Image_Entry *ie)
 #endif
 }
 
+void
+_evas_common_rgba_image_post_surface(Image_Entry *ie)
+{
+#ifdef HAVE_PIXMAN
+   RGBA_Image   *im = (RGBA_Image *) ie;
+   
+   if (im->pixman.im) pixman_image_unref(im->pixman.im);
+   if (im->cache_entry.flags.alpha)
+     {
+        im->pixman.im = pixman_image_create_bits
+        (
+// FIXME: endianess determines this            
+            PIXMAN_a8r8g8b8,
+//            PIXMAN_b8g8r8a8, 
+            im->cache_entry.w, im->cache_entry.h,
+            im->image.data, 
+            im->cache_entry.w * 4
+        );
+     }
+   else
+     {
+        im->pixman.im = pixman_image_create_bits
+        (
+// FIXME: endianess determines this            
+            PIXMAN_x8r8g8b8,
+//            PIXMAN_b8g8r8x8,
+            im->cache_entry.w, im->cache_entry.h,
+            im->image.data, 
+            im->cache_entry.w * 4
+        );
+     }
+#else
+   ie = NULL;
+#endif
+}
+
 static int
 _evas_common_rgba_image_surface_alloc(Image_Entry *ie, unsigned int w, unsigned int h)
 {
@@ -275,7 +312,8 @@ _evas_common_rgba_image_surface_alloc(Image_Entry *ie, unsigned int w, unsigned
 #  endif
 # endif
 #endif
-
+   _evas_common_rgba_image_post_surface(ie);
+   
    return 0;
 }
 
@@ -284,6 +322,13 @@ _evas_common_rgba_image_surface_delete(Image_Entry *ie)
 {
    RGBA_Image   *im = (RGBA_Image *) ie;
 
+#ifdef HAVE_PIXMAN
+   if (im->pixman.im)
+     {
+        pixman_image_unref(im->pixman.im);
+        im->pixman.im = NULL;
+     }
+#endif   
    if (ie->file)
      DBG("unload: [%p] %s %s", ie, ie->file, ie->key);
    if ((im->cs.data) && (im->image.data))

diff --git a/src/lib/engines/common/evas_image_private.h b/src/lib/engines/common/evas_image_private.h
index d9aeea7..cf61369 100644 (file)
--- a/src/lib/engines/common/evas_image_private.h
+++ b/src/lib/engines/common/evas_image_private.h
@@ -13,5 +13,7 @@ void evas_common_rgba_image_scalecache_shutdown(Image_Entry *ie);
 void evas_common_rgba_image_scalecache_dirty(Image_Entry *ie);
 void evas_common_rgba_image_scalecache_orig_use(Image_Entry *ie);
 int evas_common_rgba_image_scalecache_usage_get(Image_Entry *ie);
-    
+
+void _evas_common_rgba_image_post_surface(Image_Entry *ie);
+
 #endif /* _EVAS_IMAGE_PRIVATE_H */

diff --git a/src/lib/engines/common/evas_image_scalecache.c b/src/lib/engines/common/evas_image_scalecache.c
index 63d4c47..dc9ade6 100644 (file)
--- a/src/lib/engines/common/evas_image_scalecache.c
+++ b/src/lib/engines/common/evas_image_scalecache.c
@@ -518,18 +518,11 @@ evas_common_rgba_image_scalecache_do(Image_Entry *ie, RGBA_Image *dst,
         LKU(im->cache.lock);
         if (im->image.data)
           {
-             if (smooth)
-               evas_common_scale_rgba_in_to_out_clip_smooth(im, dst, dc,
-                                                            src_region_x, src_region_y, 
-                                                            src_region_w, src_region_h,
-                                                            dst_region_x, dst_region_y, 
-                                                            dst_region_w, dst_region_h);
-             else
-               evas_common_scale_rgba_in_to_out_clip_sample(im, dst, dc,
-                                                            src_region_x, src_region_y, 
-                                                            src_region_w, src_region_h,
-                                                            dst_region_x, dst_region_y, 
-                                                            dst_region_w, dst_region_h);
+             evas_common_scale_rgba_in_to_out_clip_sample(im, dst, dc,
+                                                          src_region_x, src_region_y, 
+                                                          src_region_w, src_region_h,
+                                                          dst_region_x, dst_region_y, 
+                                                          dst_region_w, dst_region_h);
           }
         return;
      }

diff --git a/src/lib/engines/common/evas_scale_sample.c b/src/lib/engines/common/evas_scale_sample.c
index 9eefe14..68d9e49 100644 (file)
--- a/src/lib/engines/common/evas_scale_sample.c
+++ b/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,
 
    if ((dst_region_w == src_region_w) && (dst_region_h == src_region_h))
      {
-       ptr = src_data + ((dst_clip_y - dst_region_y + src_region_y) * src_w) + (dst_clip_x - dst_region_x) + src_region_x;
-       for (y = 0; y < dst_clip_h; y++)
-         {
-           /* * blend here [clip_w *] ptr -> dst_ptr * */
-            if (mask)
-             {
-                 mask += dst_clip_x - dc->mask.x;
-                 mask += (dst_clip_y - dc->mask.y) * maskobj->cache_entry.w;
-             }
+#ifdef HAVE_PIXMAN
+        if ((1) &&
+            (src->pixman.im) && (dst->pixman.im) && 
+            ((!dc->mul.use) ||
+                ((dc->mul.use) && (dc->mul.col == 0xffffffff))) &&
+            ((dc->render_op == _EVAS_RENDER_COPY) ||
+                (dc->render_op == _EVAS_RENDER_BLEND))
+            )
+          {
+             pixman_op_t op = PIXMAN_OP_SRC; // _EVAS_RENDER_COPY
+             if (dc->render_op == _EVAS_RENDER_BLEND) op = PIXMAN_OP_OVER;
+             pixman_image_composite(op,
+                                    src->pixman.im, NULL,
+                                    dst->pixman.im,
+                                    (dst_clip_x - dst_region_x) + src_region_x,
+                                    (dst_clip_y - dst_region_y) + src_region_y, 
+                                    0, 0,
+                                    dst_clip_x, dst_clip_y, 
+                                    dst_clip_w, dst_clip_h);
+          }
+        else
+#endif
+          {
+             ptr = src_data + ((dst_clip_y - dst_region_y + src_region_y) * src_w) + (dst_clip_x - dst_region_x) + src_region_x;
+             for (y = 0; y < dst_clip_h; y++)
+               {
+                  /* * blend here [clip_w *] ptr -> dst_ptr * */
+                  if (mask)
+                    {
+                       mask += dst_clip_x - dc->mask.x;
+                       mask += (dst_clip_y - dc->mask.y) * maskobj->cache_entry.w;
+                    }
 #ifdef EVAS_SLI
-            if (((y + dst_clip_y) % dc->sli.h) == dc->sli.y)
+                  if (((y + dst_clip_y) % dc->sli.h) == dc->sli.y)
 #endif
-              {
-                 func(ptr, mask, dc->mul.col, dst_ptr, dst_clip_w);
-              }
-           ptr += src_w;
-           dst_ptr += dst_w;
-           if (mask) mask += maskobj->cache_entry.w;
+                    {
+                       func(ptr, mask, dc->mul.col, dst_ptr, dst_clip_w);
+                    }
+                  ptr += src_w;
+                  dst_ptr += dst_w;
+                  if (mask) mask += maskobj->cache_entry.w;
+               }
          }
      }
    else

diff --git a/src/lib/engines/common_16/Makefile.am b/src/lib/engines/common_16/Makefile.am
index c7579fc..ef2ab30 100644 (file)
--- a/src/lib/engines/common_16/Makefile.am
+++ b/src/lib/engines/common_16/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
 -I$(top_srcdir)/src/lib/include \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @VALGRIND_CFLAGS@ \
 @EINA_CFLAGS@ \
 @EET_CFLAGS@ \

diff --git a/src/lib/engines/common_8/Makefile.am b/src/lib/engines/common_8/Makefile.am
index 5fdd086..58a1b1f 100644 (file)
--- a/src/lib/engines/common_8/Makefile.am
+++ b/src/lib/engines/common_8/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
 -I$(top_srcdir)/src/lib/include \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @VALGRIND_CFLAGS@ \
 @EINA_CFLAGS@ \
 @EET_CFLAGS@ \

diff --git a/src/lib/file/Makefile.am b/src/lib/file/Makefile.am
index 8d0ee97..7875fbe 100644 (file)
--- a/src/lib/file/Makefile.am
+++ b/src/lib/file/Makefile.am
@@ -11,8 +11,9 @@ AM_CPPFLAGS = \
 @FREETYPE_CFLAGS@ \
 @EINA_CFLAGS@ \
 @EVIL_CFLAGS@ \
-@WIN32_CPPFLAGS@
-
+@WIN32_CPPFLAGS@ \
+@PIXMAN_CFLAGS@
+                       
 AM_CFLAGS = @WIN32_CFLAGS@
 
 noinst_LTLIBRARIES      = libevas_file.la

diff --git a/src/lib/include/evas_common.h b/src/lib/include/evas_common.h
index 74077d8..7fa2b97 100644 (file)
--- a/src/lib/include/evas_common.h
+++ b/src/lib/include/evas_common.h
@@ -13,6 +13,10 @@
 #include "Evas.h"
 #include "Evas_GL.h"
 
+#ifdef HAVE_PIXMAN
+#include <pixman.h>
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -819,6 +823,12 @@ struct _RGBA_Image
       unsigned long long newest_usage;
       unsigned long long newest_usage_count;
    } cache;
+
+#ifdef HAVE_PIXMAN
+   struct {
+      pixman_image_t *im;
+   } pixman;
+#endif   
 };
 
 struct _RGBA_Polygon_Point

diff --git a/src/modules/engines/buffer/Makefile.am b/src/modules/engines/buffer/Makefile.am
index aa02fc6..19ac5a7 100644 (file)
--- a/src/modules/engines/buffer/Makefile.am
+++ b/src/modules/engines/buffer/Makefile.am
@@ -7,7 +7,8 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
 -I$(top_srcdir)/src/modules/engines \
 @EINA_CFLAGS@ \
-@FREETYPE_CFLAGS@
+@FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@
 
 AM_CFLAGS = @WIN32_CFLAGS@
 

diff --git a/src/modules/engines/direct3d/Makefile.am b/src/modules/engines/direct3d/Makefile.am
index 6b64ef5..cdbfd52 100644 (file)
--- a/src/modules/engines/direct3d/Makefile.am
+++ b/src/modules/engines/direct3d/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/modules/engines \
 @EINA_CFLAGS@ \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @evas_engine_direct3d_cflags@
 
 if BUILD_ENGINE_DIRECT3D

diff --git a/src/modules/engines/directfb/Makefile.am b/src/modules/engines/directfb/Makefile.am
index fae87da..5b00166 100644 (file)
--- a/src/modules/engines/directfb/Makefile.am
+++ b/src/modules/engines/directfb/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
 -I$(top_srcdir)/src/modules/engines \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @EINA_CFLAGS@ \
 @evas_engine_directfb_cflags@
 

diff --git a/src/modules/engines/fb/Makefile.am b/src/modules/engines/fb/Makefile.am
index 47527f7..55127bb 100644 (file)
--- a/src/modules/engines/fb/Makefile.am
+++ b/src/modules/engines/fb/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
 -I$(top_srcdir)/src/modules/engines \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @EINA_CFLAGS@ \
 @evas_engine_fb_cflags@
 

diff --git a/src/modules/engines/gl_common/Makefile.am b/src/modules/engines/gl_common/Makefile.am
index e0a0fbb..ac74f13 100644 (file)
--- a/src/modules/engines/gl_common/Makefile.am
+++ b/src/modules/engines/gl_common/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
 -I$(top_srcdir)/src/lib/include \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @EINA_CFLAGS@
 
 if BUILD_ENGINE_GL_COMMON

diff --git a/src/modules/engines/gl_sdl/Makefile.am b/src/modules/engines/gl_sdl/Makefile.am
index 57da21b..961bf41 100644 (file)
--- a/src/modules/engines/gl_sdl/Makefile.am
+++ b/src/modules/engines/gl_sdl/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
 -I$(top_srcdir)/src/modules/engines/gl_common \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @EINA_CFLAGS@ \
 @evas_engine_gl_sdl_cflags@
 

diff --git a/src/modules/engines/gl_x11/Makefile.am b/src/modules/engines/gl_x11/Makefile.am
index 91cd0d4..3701a0d 100644 (file)
--- a/src/modules/engines/gl_x11/Makefile.am
+++ b/src/modules/engines/gl_x11/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
 -I$(top_srcdir)/src/modules/engines/gl_common \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @EINA_CFLAGS@ \
 @evas_engine_gl_x11_cflags@
 

diff --git a/src/modules/engines/software_16/Makefile.am b/src/modules/engines/software_16/Makefile.am
index 1735d7b..070d610 100644 (file)
--- a/src/modules/engines/software_16/Makefile.am
+++ b/src/modules/engines/software_16/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
 -I$(top_srcdir)/src/modules/engines \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @EINA_CFLAGS@
 
 AM_CFLAGS = @WIN32_CFLAGS@

diff --git a/src/modules/engines/software_16_ddraw/Makefile.am b/src/modules/engines/software_16_ddraw/Makefile.am
index d32019e..adbf477 100644 (file)
--- a/src/modules/engines/software_16_ddraw/Makefile.am
+++ b/src/modules/engines/software_16_ddraw/Makefile.am
@@ -9,6 +9,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/modules/engines/software_16 \
 @EINA_CFLAGS@ \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @evas_engine_software_16_ddraw_cflags@
 
 if BUILD_ENGINE_SOFTWARE_16_DDRAW

diff --git a/src/modules/engines/software_16_sdl/Makefile.am b/src/modules/engines/software_16_sdl/Makefile.am
index 5a8dc2f..af0197d 100644 (file)
--- a/src/modules/engines/software_16_sdl/Makefile.am
+++ b/src/modules/engines/software_16_sdl/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS     = 1.4 foreign
 
 MAINTAINERCLEANFILES = Makefile.in
 
-INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @FREETYPE_CFLAGS@ @SDL_CFLAGS@ @EINA_CFLAGS@
+INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @FREETYPE_CFLAGS@ @PIXMAN_CFLAGS@ @SDL_CFLAGS@ @EINA_CFLAGS@
 
 if BUILD_ENGINE_SOFTWARE_SDL
 

diff --git a/src/modules/engines/software_16_wince/Makefile.am b/src/modules/engines/software_16_wince/Makefile.am
index d7e39b4..7f0c666 100644 (file)
--- a/src/modules/engines/software_16_wince/Makefile.am
+++ b/src/modules/engines/software_16_wince/Makefile.am
@@ -9,6 +9,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/modules/engines/software_16 \
 @EINA_CFLAGS@ \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @evas_engine_software_16_wince_cflags@
 
 if BUILD_ENGINE_SOFTWARE_16_WINCE

diff --git a/src/modules/engines/software_16_x11/Makefile.am b/src/modules/engines/software_16_x11/Makefile.am
index dc24584..812492e 100644 (file)
--- a/src/modules/engines/software_16_x11/Makefile.am
+++ b/src/modules/engines/software_16_x11/Makefile.am
@@ -9,6 +9,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/modules/engines/software_16 \
 @FREETYPE_CFLAGS@ \
 @EINA_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @evas_engine_software_16_x11_cflags@
 
 if BUILD_ENGINE_SOFTWARE_16_X11

diff --git a/src/modules/engines/software_8/Makefile.am b/src/modules/engines/software_8/Makefile.am
index 4c48018..145b766 100644 (file)
--- a/src/modules/engines/software_8/Makefile.am
+++ b/src/modules/engines/software_8/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
 -I$(top_srcdir)/src/modules/engines \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @EINA_CFLAGS@
 
 AM_CFLAGS = @WIN32_CFLAGS@

diff --git a/src/modules/engines/software_8_x11/Makefile.am b/src/modules/engines/software_8_x11/Makefile.am
index bfb2b9b..3689577 100644 (file)
--- a/src/modules/engines/software_8_x11/Makefile.am
+++ b/src/modules/engines/software_8_x11/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/modules/engines \
 -I$(top_srcdir)/src/modules/engines/software_8 \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @EINA_CFLAGS@ \
 @evas_engine_software_8_x11_cflags@ \
 -I/usr/include/pixman-1

diff --git a/src/modules/engines/software_ddraw/Makefile.am b/src/modules/engines/software_ddraw/Makefile.am
index 7a5856e..594c7ab 100644 (file)
--- a/src/modules/engines/software_ddraw/Makefile.am
+++ b/src/modules/engines/software_ddraw/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/modules/engines \
 @EINA_CFLAGS@ \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @evas_engine_software_ddraw_cflags@
 
 if BUILD_ENGINE_SOFTWARE_DDRAW

diff --git a/src/modules/engines/software_gdi/Makefile.am b/src/modules/engines/software_gdi/Makefile.am
index 02a60c0..ccb8084 100644 (file)
--- a/src/modules/engines/software_gdi/Makefile.am
+++ b/src/modules/engines/software_gdi/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/modules/engines \
 @EINA_CFLAGS@ \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @evas_engine_software_gdi_cflags@
 
 if BUILD_ENGINE_SOFTWARE_GDI

diff --git a/src/modules/engines/software_generic/Makefile.am b/src/modules/engines/software_generic/Makefile.am
index 8278969..d7986f1 100644 (file)
--- a/src/modules/engines/software_generic/Makefile.am
+++ b/src/modules/engines/software_generic/Makefile.am
@@ -7,7 +7,8 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
 -I$(top_srcdir)/src/modules/engines \
 @EINA_CFLAGS@ \
-@FREETYPE_CFLAGS@
+@FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@
 
 AM_CFLAGS = @WIN32_CFLAGS@
 

diff --git a/src/modules/engines/software_sdl/Makefile.am b/src/modules/engines/software_sdl/Makefile.am
index 57892f6..dc548ba 100644 (file)
--- a/src/modules/engines/software_sdl/Makefile.am
+++ b/src/modules/engines/software_sdl/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
 -I$(top_srcdir)/src/modules/engines \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @EINA_CFLAGS@ \
 @evas_engine_software_sdl_cflags@
 

diff --git a/src/modules/engines/software_x11/Makefile.am b/src/modules/engines/software_x11/Makefile.am
index 86960b7..675c6cd 100644 (file)
--- a/src/modules/engines/software_x11/Makefile.am
+++ b/src/modules/engines/software_x11/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
 -I$(top_srcdir)/src/modules/engines \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @EINA_CFLAGS@ \
 @evas_engine_software_xlib_cflags@ \
 @evas_engine_software_xcb_cflags@

diff --git a/src/modules/loaders/bmp/Makefile.am b/src/modules/loaders/bmp/Makefile.am
index 430156a..857f3b9 100644 (file)
--- a/src/modules/loaders/bmp/Makefile.am
+++ b/src/modules/loaders/bmp/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
 -I$(top_srcdir)/src/lib/include \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @EINA_CFLAGS@ \
 @EVIL_CFLAGS@ \
 @WIN32_CPPFLAGS@

diff --git a/src/modules/loaders/edb/Makefile.am b/src/modules/loaders/edb/Makefile.am
index bdb2127..a0baf6b 100644 (file)
--- a/src/modules/loaders/edb/Makefile.am
+++ b/src/modules/loaders/edb/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
 -I$(top_srcdir)/src/lib/include \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @evas_image_loader_edb_cflags@ \
 @EINA_CFLAGS@
 

diff --git a/src/modules/loaders/eet/Makefile.am b/src/modules/loaders/eet/Makefile.am
index 39b2f0b..c96a8d3 100644 (file)
--- a/src/modules/loaders/eet/Makefile.am
+++ b/src/modules/loaders/eet/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
 -I$(top_srcdir)/src/lib/include \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @evas_image_loader_eet_cflags@ \
 @EINA_CFLAGS@
 

diff --git a/src/modules/loaders/gif/Makefile.am b/src/modules/loaders/gif/Makefile.am
index 6e3a442..9234370 100644 (file)
--- a/src/modules/loaders/gif/Makefile.am
+++ b/src/modules/loaders/gif/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
 -I$(top_srcdir)/src/lib/include \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @evas_image_loader_gif_cflags@ \
 @EINA_CFLAGS@
 

diff --git a/src/modules/loaders/ico/Makefile.am b/src/modules/loaders/ico/Makefile.am
index c06866d..044dd0d 100644 (file)
--- a/src/modules/loaders/ico/Makefile.am
+++ b/src/modules/loaders/ico/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
 -I$(top_srcdir)/src/lib/include \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @EINA_CFLAGS@ \
 @EVIL_CFLAGS@ \
 @WIN32_CPPFLAGS@

diff --git a/src/modules/loaders/jpeg/Makefile.am b/src/modules/loaders/jpeg/Makefile.am
index ffeb2ac..2088ba8 100644 (file)
--- a/src/modules/loaders/jpeg/Makefile.am
+++ b/src/modules/loaders/jpeg/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
 -I$(top_srcdir)/src/lib/include \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @EINA_CFLAGS@ \
 @evas_image_loader_jpeg_cflags@ \
 @EVIL_CFLAGS@ \

diff --git a/src/modules/loaders/pmaps/Makefile.am b/src/modules/loaders/pmaps/Makefile.am
index 6354990..dc07a32 100644 (file)
--- a/src/modules/loaders/pmaps/Makefile.am
+++ b/src/modules/loaders/pmaps/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
 -I$(top_srcdir)/src/lib/include \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @EINA_CFLAGS@ \
 @evas_image_loader_pmaps_cflags@ \
 @EVIL_CFLAGS@ \

diff --git a/src/modules/loaders/png/Makefile.am b/src/modules/loaders/png/Makefile.am
index ff14bb8..f9387a5 100644 (file)
--- a/src/modules/loaders/png/Makefile.am
+++ b/src/modules/loaders/png/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
 -I$(top_srcdir)/src/lib/include \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @EINA_CFLAGS@ \
 @evas_image_loader_png_cflags@ \
 @EVIL_CFLAGS@ \

diff --git a/src/modules/loaders/svg/Makefile.am b/src/modules/loaders/svg/Makefile.am
index d8e60da..4b8d1b5 100644 (file)
--- a/src/modules/loaders/svg/Makefile.am
+++ b/src/modules/loaders/svg/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
 -I$(top_srcdir)/src/lib/include \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @EINA_CFLAGS@ \
 @evas_image_loader_svg_cflags@
 

diff --git a/src/modules/loaders/tga/Makefile.am b/src/modules/loaders/tga/Makefile.am
index f784d63..4d9e240 100644 (file)
--- a/src/modules/loaders/tga/Makefile.am
+++ b/src/modules/loaders/tga/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
 -I$(top_srcdir)/src/lib/include \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @EINA_CFLAGS@ \
 @EVIL_CFLAGS@ \
 @WIN32_CPPFLAGS@

diff --git a/src/modules/loaders/tiff/Makefile.am b/src/modules/loaders/tiff/Makefile.am
index b1aa818..f617c5e 100644 (file)
--- a/src/modules/loaders/tiff/Makefile.am
+++ b/src/modules/loaders/tiff/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
 -I$(top_srcdir)/src/lib/include \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @EINA_CFLAGS@ \
 @evas_image_loader_tiff_cflags@ \
 @EVIL_CFLAGS@ \

diff --git a/src/modules/loaders/wbmp/Makefile.am b/src/modules/loaders/wbmp/Makefile.am
index 577d42e..eed287a 100644 (file)
--- a/src/modules/loaders/wbmp/Makefile.am
+++ b/src/modules/loaders/wbmp/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
 -I$(top_srcdir)/src/lib/include \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @EINA_CFLAGS@ \
 @EVIL_CFLAGS@ \
 @WIN32_CPPFLAGS@

diff --git a/src/modules/loaders/xpm/Makefile.am b/src/modules/loaders/xpm/Makefile.am
index de81294..b8cb1fa 100644 (file)
--- a/src/modules/loaders/xpm/Makefile.am
+++ b/src/modules/loaders/xpm/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
 -I$(top_srcdir)/src/lib/include \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @EINA_CFLAGS@ \
 @evas_image_loader_xpm_cflags@ \
 @EVIL_CFLAGS@ \

diff --git a/src/modules/savers/edb/Makefile.am b/src/modules/savers/edb/Makefile.am
index e273d9b..4614cec 100644 (file)
--- a/src/modules/savers/edb/Makefile.am
+++ b/src/modules/savers/edb/Makefile.am
@@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in
 AM_CPPFLAGS           = -I. \
                         -I$(top_srcdir)/src/lib \
                         -I$(top_srcdir)/src/lib/include \
-                        @FREETYPE_CFLAGS@ @evas_image_loader_edb_cflags@ \
+                        @FREETYPE_CFLAGS@ @PIXMAN_CFLAGS@ @evas_image_loader_edb_cflags@ \
                         @EINA_CFLAGS@
 
 if BUILD_LOADER_EDB

diff --git a/src/modules/savers/eet/Makefile.am b/src/modules/savers/eet/Makefile.am
index 94f3a55..1c7f71c 100644 (file)
--- a/src/modules/savers/eet/Makefile.am
+++ b/src/modules/savers/eet/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
 -I$(top_srcdir)/src/lib/include \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @EINA_CFLAGS@ \
 @evas_image_loader_eet_cflags@
 

diff --git a/src/modules/savers/jpeg/Makefile.am b/src/modules/savers/jpeg/Makefile.am
index 7d86faa..82a40ac 100644 (file)
--- a/src/modules/savers/jpeg/Makefile.am
+++ b/src/modules/savers/jpeg/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS= \
 -I$(top_srcdir)/src/lib \
 -I$(top_srcdir)/src/lib/include \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @EINA_CFLAGS@ \
 @evas_image_loader_jpeg_cflags@
 

diff --git a/src/modules/savers/png/Makefile.am b/src/modules/savers/png/Makefile.am
index b9d9cd5..1429f2e 100644 (file)
--- a/src/modules/savers/png/Makefile.am
+++ b/src/modules/savers/png/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
 -I$(top_srcdir)/src/lib/include \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @EINA_CFLAGS@ \
 @evas_image_loader_png_cflags@ \
 @EVIL_CFLAGS@ \

diff --git a/src/modules/savers/tiff/Makefile.am b/src/modules/savers/tiff/Makefile.am
index c754c0b..6d58d26 100644 (file)
--- a/src/modules/savers/tiff/Makefile.am
+++ b/src/modules/savers/tiff/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
 -I$(top_srcdir)/src/lib/include \
 @FREETYPE_CFLAGS@ \
+@PIXMAN_CFLAGS@ \
 @EINA_CFLAGS@ \
 @evas_image_loader_tiff_cflags@