From 455afb707fe81f1f81874ba3ea753ffda853eca4 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Wed, 19 Oct 2016 11:59:34 -0500 Subject: [PATCH] Revert "wayland_shm: Add swap mode fallback when buffer age changes" This reverts commit 62ca4486ea30fd63a5589ea7af373a5cb9982031. Honestly, I think the gl_x11 code doesn't make sense either. :) There's no logical reason that we have to do that, though it may be hiding some other bug? If that's the case, the bug should be fixed properly. --- src/modules/evas/engines/wayland_shm/evas_engine.h | 1 - src/modules/evas/engines/wayland_shm/evas_outbuf.c | 15 +++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.h b/src/modules/evas/engines/wayland_shm/evas_engine.h index bae4e37..7436c6b 100644 --- a/src/modules/evas/engines/wayland_shm/evas_engine.h +++ b/src/modules/evas/engines/wayland_shm/evas_engine.h @@ -107,7 +107,6 @@ struct _Outbuf int rotation; int onebuf; int num_buff; - int prev_age; Outbuf_Depth depth; Evas_Engine_Info_Wayland_Shm *info; diff --git a/src/modules/evas/engines/wayland_shm/evas_outbuf.c b/src/modules/evas/engines/wayland_shm/evas_outbuf.c index b372864..6dafa85 100644 --- a/src/modules/evas/engines/wayland_shm/evas_outbuf.c +++ b/src/modules/evas/engines/wayland_shm/evas_outbuf.c @@ -314,22 +314,17 @@ _evas_outbuf_flush(Outbuf *ob, Tilebuf_Rect *rects EINA_UNUSED, Evas_Render_Mode Render_Engine_Swap_Mode _evas_outbuf_swap_mode_get(Outbuf *ob) { - Render_Engine_Swap_Mode mode; int age; LOGFN(__FILE__, __LINE__, __FUNCTION__); age = ob->surface->funcs.assign(ob->surface); - if (age == 1) mode = MODE_COPY; - else if (age == 2) mode = MODE_DOUBLE; - else if (age == 3) mode = MODE_TRIPLE; - else if (age == 4) mode = MODE_QUADRUPLE; - else mode = MODE_FULL; + if (age == 1) return MODE_COPY; + else if (age == 2) return MODE_DOUBLE; + else if (age == 3) return MODE_TRIPLE; + else if (age == 4) return MODE_QUADRUPLE; - if (ob->prev_age != age) mode = MODE_FULL; - ob->prev_age = age; - - return mode; + return MODE_FULL; } int -- 2.7.4