6 files changed, 93 insertions, 29 deletions

diff --git a/libraries/evas/src/modules/engines/buffer/Evas_Engine_Buffer.h b/libraries/evas/src/modules/engines/buffer/Evas_Engine_Buffer.h
index e6d11d1..a9cbbfb 100644
--- a/libraries/evas/src/modules/engines/buffer/Evas_Engine_Buffer.h
+++ b/libraries/evas/src/modules/engines/buffer/Evas_Engine_Buffer.h
@@ -29,7 +29,10 @@ struct _Evas_Engine_Info_Buffer
       struct {
          void * (*new_update_region) (int x, int y, int w, int h, int *row_bytes);
          void   (*free_update_region) (int x, int y, int w, int h, void *data);
+         void * (*switch_buffer) (void *data, void *dest_buffer);
       } func;
+
+      void *switch_data;
    } info;
 
    /* non-blocking or blocking mode */
diff --git a/libraries/evas/src/modules/engines/buffer/Makefile.am b/libraries/evas/src/modules/engines/buffer/Makefile.am
index 19ac5a7..4090b6f 100644
--- a/libraries/evas/src/modules/engines/buffer/Makefile.am
+++ b/libraries/evas/src/modules/engines/buffer/Makefile.am
@@ -10,8 +10,6 @@ AM_CPPFLAGS = \
 @FREETYPE_CFLAGS@ \
 @PIXMAN_CFLAGS@
 
-AM_CFLAGS = @WIN32_CFLAGS@
-
 if BUILD_ENGINE_BUFFER
 
 BUFFER_SOURCES = \
diff --git a/libraries/evas/src/modules/engines/buffer/Makefile.in b/libraries/evas/src/modules/engines/buffer/Makefile.in
index ec9c0b8..bd9818e 100644
--- a/libraries/evas/src/modules/engines/buffer/Makefile.in
+++ b/libraries/evas/src/modules/engines/buffer/Makefile.in
@@ -190,6 +190,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
 EVIL_CFLAGS = @EVIL_CFLAGS@
 EVIL_LIBS = @EVIL_LIBS@
 EXEEXT = @EXEEXT@
+EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
+EXOTIC_LIBS = @EXOTIC_LIBS@
 FGREP = @FGREP@
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -240,6 +242,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
 PIXMAN_LIBS = @PIXMAN_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PNG_CFLAGS = @PNG_CFLAGS@
 PNG_LIBS = @PNG_LIBS@
 RANLIB = @RANLIB@
@@ -258,8 +262,6 @@ VERSION = @VERSION@
 VMAJ = @VMAJ@
 WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
 WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-WIN32_CFLAGS = @WIN32_CFLAGS@
-WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
 XCB_CFLAGS = @XCB_CFLAGS@
 XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
 XCB_GL_LIBS = @XCB_GL_LIBS@
@@ -333,8 +335,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
 evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
 evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
 evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@
-evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@
 evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
 evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
 evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
@@ -427,7 +427,6 @@ AM_CPPFLAGS = \
 @FREETYPE_CFLAGS@ \
 @PIXMAN_CFLAGS@
 
-AM_CFLAGS = @WIN32_CFLAGS@
 @BUILD_ENGINE_BUFFER_TRUE@BUFFER_SOURCES = \
 @BUILD_ENGINE_BUFFER_TRUE@evas_engine.c \
 @BUILD_ENGINE_BUFFER_TRUE@evas_outbuf.c
diff --git a/libraries/evas/src/modules/engines/buffer/evas_engine.c b/libraries/evas/src/modules/engines/buffer/evas_engine.c
index e8dff7a..758ef10 100644
--- a/libraries/evas/src/modules/engines/buffer/evas_engine.c
+++ b/libraries/evas/src/modules/engines/buffer/evas_engine.c
@@ -25,11 +25,12 @@ struct _Render_Engine
    Outbuf           *ob;
    Tilebuf_Rect     *rects;
    Eina_Inlist *cur_rect;
+   Eina_Inarray      previous_rects;
    int               end : 1;
 };
 
 /* prototypes we will use here */
-static void *_output_setup(int w, int h, void *dest_buffer, int dest_buffer_row_bytes, int depth_type, int use_color_key, int alpha_threshold, int color_key_r, int color_key_g, int color_key_b, void *(*new_update_region) (int x, int y, int w, int h, int *row_bytes), void (*free_update_region) (int x, int y, int w, int h, void *data));
+static void *_output_setup(int w, int h, void *dest_buffer, int dest_buffer_row_bytes, int depth_type, int use_color_key, int alpha_threshold, int color_key_r, int color_key_g, int color_key_b, void *(*new_update_region) (int x, int y, int w, int h, int *row_bytes), void (*free_update_region) (int x, int y, int w, int h, void *data), void *(*switch_buffer) (void *data, void *dest_buffer), void *switch_data);
 
 static void *eng_info(Evas *e __UNUSED__);
 static void eng_info_free(Evas *e __UNUSED__, void *info);
@@ -58,7 +59,9 @@ _output_setup(int w,
               int color_key_g,
               int color_key_b,
               void *(*new_update_region) (int x, int y, int w, int h, int *row_bytes),
-              void (*free_update_region) (int x, int y, int w, int h, void *data)
+              void (*free_update_region) (int x, int y, int w, int h, void *data),
+              void *(*switch_buffer) (void *data, void *dest_buffer),
+              void *switch_data
               )
 {
    Render_Engine *re;
@@ -81,7 +84,7 @@ _output_setup(int w,
    evas_common_tilebuf_init();
 
    evas_buffer_outbuf_buf_init();
-   
+
      {
         Outbuf_Depth dep;
         DATA32 color_key = 0;
@@ -110,10 +113,13 @@ _output_setup(int w,
                                                  color_key,
                                                  alpha_threshold,
                                                  new_update_region,
-                                                 free_update_region);
+                                                 free_update_region,
+                                                 switch_buffer,
+                                                 switch_data);
      }
    re->tb = evas_common_tilebuf_new(w, h);
    evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
+   eina_inarray_setup(&re->previous_rects, sizeof (Eina_Rectangle), 8);
    return re;
 }
 
@@ -155,7 +161,9 @@ eng_setup(Evas *e, void *in)
                       info->info.color_key_g,
                       info->info.color_key_b,
                       info->info.func.new_update_region,
-                      info->info.func.free_update_region);
+                      info->info.func.free_update_region,
+                      info->info.func.switch_buffer,
+                      info->info.switch_data);
    if (e->engine.data.output)
      eng_output_free(e->engine.data.output);
    e->engine.data.output = re;
@@ -195,6 +203,8 @@ eng_output_resize(void *data, int w, int h)
         char     use_color_key;
         void * (*new_update_region) (int x, int y, int w, int h, int *row_bytes);
         void   (*free_update_region) (int x, int y, int w, int h, void *data);
+        void * (*switch_buffer) (void *switch_data, void *dest);
+        void    *switch_data;
 
         depth = re->ob->depth;
         dest = re->ob->dest;
@@ -204,6 +214,8 @@ eng_output_resize(void *data, int w, int h)
         use_color_key = re->ob->use_color_key;
         new_update_region = re->ob->func.new_update_region;
         free_update_region = re->ob->func.free_update_region;
+        switch_buffer = re->ob->func.switch_buffer;
+        switch_data = re->ob->switch_data;
         evas_buffer_outbuf_buf_free(re->ob);
         re->ob = evas_buffer_outbuf_buf_setup_fb(w,
                                                  h,
@@ -214,7 +226,9 @@ eng_output_resize(void *data, int w, int h)
                                                  color_key,
                                                  alpha_level,
                                                  new_update_region,
-                                                 free_update_region);
+                                                 free_update_region,
+                                                 switch_buffer,
+                                                 switch_data);
      }
    evas_common_tilebuf_free(re->tb);
    re->tb = evas_common_tilebuf_new(w, h);
@@ -275,6 +289,37 @@ eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, i
    if (!re->rects)
      {
         re->rects = evas_common_tilebuf_get_render_rects(re->tb);
+
+        /* handle double buffering */
+        if (re->ob->func.switch_buffer)
+          {
+             Eina_Rectangle *pushing;
+
+             if (re->ob->first_frame && !re->previous_rects.len)
+               {
+                  evas_common_tilebuf_add_redraw(re->tb, 0, 0, re->ob->w, re->ob->h);
+                  re->ob->first_frame = 0;
+               }
+
+             /* push previous frame */
+             EINA_INARRAY_FOREACH(&re->previous_rects, pushing)
+               evas_common_tilebuf_add_redraw(re->tb, pushing->x, pushing->y, pushing->w, pushing->h);
+             eina_inarray_flush(&re->previous_rects);
+
+             /* save current list of damage */
+             EINA_INLIST_FOREACH(re->rects, rect)
+               {
+                  Eina_Rectangle local;
+
+                  EINA_RECTANGLE_SET(&local, rect->x, rect->y, rect->w, rect->h);
+                  eina_inarray_append(&re->previous_rects, &local);
+               }
+
+             /* and regenerate the damage list by tacking into account the damage over two frames */
+             evas_common_tilebuf_free_render_rects(re->rects);
+             re->rects = evas_common_tilebuf_get_render_rects(re->tb);
+          }
+
         re->cur_rect = EINA_INLIST_GET(re->rects);
      }
    if (!re->cur_rect) return NULL;
@@ -306,7 +351,7 @@ eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int
    re = (Render_Engine *)data;
 #ifdef BUILD_PIPE_RENDER
    evas_common_pipe_map_begin(surface);
-#endif   
+#endif
    evas_buffer_outbuf_buf_push_updated_region(re->ob, surface, x, y, w, h);
    evas_buffer_outbuf_buf_free_region_for_update(re->ob, surface);
    evas_common_cpu_end_opt();
@@ -315,17 +360,13 @@ eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int
 static void
 eng_output_flush(void *data)
 {
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
+   Render_Engine *re = (Render_Engine *)data;
+   evas_buffer_outbuf_buf_switch_buffer(re->ob);
 }
 
 static void
-eng_output_idle_flush(void *data)
+eng_output_idle_flush(void *data __UNUSED__)
 {
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
 }
 
 static Eina_Bool
diff --git a/libraries/evas/src/modules/engines/buffer/evas_engine.h b/libraries/evas/src/modules/engines/buffer/evas_engine.h
index 21c988c..af82477 100644
--- a/libraries/evas/src/modules/engines/buffer/evas_engine.h
+++ b/libraries/evas/src/modules/engines/buffer/evas_engine.h
@@ -52,14 +52,17 @@ struct _Outbuf
 
    void                         *dest;
    unsigned int                  dest_row_bytes;
+   void                         *switch_data;
 
    int                           alpha_level;
    DATA32                        color_key;
    char                          use_color_key : 1;
+   char                          first_frame : 1;
 
    struct {
       void * (*new_update_region) (int x, int y, int w, int h, int *row_bytes);
       void   (*free_update_region) (int x, int y, int w, int h, void *data);
+      void * (*switch_buffer) (void *data, void *dest_buffer);
    } func;
 
    struct {
@@ -74,12 +77,15 @@ void         evas_buffer_outbuf_buf_free                   (Outbuf *buf);
 
 Outbuf      *evas_buffer_outbuf_buf_setup_fb               (int w, int h, Outbuf_Depth depth, void *dest, int dest_row_bytes, int use_color_key, DATA32 color_key, int alpha_level,
                                                             void * (*new_update_region) (int x, int y, int w, int h, int *row_bytes),
-                                                            void   (*free_update_region) (int x, int y, int w, int h, void *data));
+                                                            void   (*free_update_region) (int x, int y, int w, int h, void *data),
+                                                            void * (*switch_buffer)(void *switch_data, void *dest),
+                                                            void *switch_data);
 
 
 RGBA_Image  *evas_buffer_outbuf_buf_new_region_for_update  (Outbuf *buf, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch);
 void         evas_buffer_outbuf_buf_free_region_for_update (Outbuf *buf, RGBA_Image *update);
 void         evas_buffer_outbuf_buf_push_updated_region    (Outbuf *buf, RGBA_Image *update, int x, int y, int w, int h);
+void         evas_buffer_outbuf_buf_switch_buffer          (Outbuf *buf);
 
 #endif
 
diff --git a/libraries/evas/src/modules/engines/buffer/evas_outbuf.c b/libraries/evas/src/modules/engines/buffer/evas_outbuf.c
index 27f7a2c..0fa1842 100644
--- a/libraries/evas/src/modules/engines/buffer/evas_outbuf.c
+++ b/libraries/evas/src/modules/engines/buffer/evas_outbuf.c
@@ -19,11 +19,12 @@ evas_buffer_outbuf_buf_free(Outbuf *buf)
 Outbuf *
 evas_buffer_outbuf_buf_setup_fb(int w, int h, Outbuf_Depth depth, void *dest, int dest_row_bytes, int use_color_key, DATA32 color_key, int alpha_level,
                                 void * (*new_update_region) (int x, int y, int w, int h, int *row_bytes),
-                                void   (*free_update_region) (int x, int y, int w, int h, void *data)
+                                void   (*free_update_region) (int x, int y, int w, int h, void *data),
+                                void * (*switch_buffer) (void *data, void *dest_buffer),
+                                void *switch_data
                                 )
 {
    Outbuf *buf;
-   int bpp;
    
    buf = calloc(1, sizeof(Outbuf));
    if (!buf) return NULL;
@@ -38,14 +39,12 @@ evas_buffer_outbuf_buf_setup_fb(int w, int h, Outbuf_Depth depth, void *dest, in
    buf->alpha_level = alpha_level;
    buf->color_key = color_key;
    buf->use_color_key = use_color_key;
+   buf->first_frame = 1;
 
    buf->func.new_update_region = new_update_region;
    buf->func.free_update_region = free_update_region;
-
-   bpp = sizeof(DATA32);
-   if ((buf->depth == OUTBUF_DEPTH_RGB_24BPP_888_888) ||
-       (buf->depth == OUTBUF_DEPTH_BGR_24BPP_888_888))
-     bpp = 3;
+   buf->func.switch_buffer = switch_buffer;
+   buf->switch_data = switch_data;
 
    if ((buf->depth == OUTBUF_DEPTH_ARGB_32BPP_8888_8888) &&
        (buf->dest) && (buf->dest_row_bytes == (buf->w * sizeof(DATA32))))
@@ -102,6 +101,24 @@ evas_buffer_outbuf_buf_free_region_for_update(Outbuf *buf, RGBA_Image *update)
 }
 
 void
+evas_buffer_outbuf_buf_switch_buffer(Outbuf *buf)
+{
+   if (buf->func.switch_buffer)
+     {
+        buf->dest = buf->func.switch_buffer(buf->switch_data, buf->dest);
+        if (buf->priv.back_buf)
+          {
+             evas_cache_image_drop(&buf->priv.back_buf->cache_entry);
+             buf->priv.back_buf = (RGBA_Image *) evas_cache_image_data(evas_common_image_cache_get(),
+                                                                       buf->w, buf->h,
+                                                                       buf->dest,
+                                                                       buf->depth == OUTBUF_DEPTH_ARGB_32BPP_8888_8888 ? 1 : 0,
+                                                                       EVAS_COLORSPACE_ARGB8888);
+          }
+     }
+}
+
+void
 evas_buffer_outbuf_buf_push_updated_region(Outbuf *buf, RGBA_Image *update, int x, int y, int w, int h)
 {
    /* copy update image to out buf & convert */