Revert "wayland_shm: Add swap mode fallback when buffer age changes"

This reverts commit 62ca4486ea.

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.
This commit is contained in:
Derek Foreman 2016-10-19 11:59:34 -05:00
parent b5f2b695b7
commit 455afb707f
2 changed files with 5 additions and 11 deletions

View File

@ -107,7 +107,6 @@ struct _Outbuf
int rotation; int rotation;
int onebuf; int onebuf;
int num_buff; int num_buff;
int prev_age;
Outbuf_Depth depth; Outbuf_Depth depth;
Evas_Engine_Info_Wayland_Shm *info; Evas_Engine_Info_Wayland_Shm *info;

View File

@ -314,22 +314,17 @@ _evas_outbuf_flush(Outbuf *ob, Tilebuf_Rect *rects EINA_UNUSED, Evas_Render_Mode
Render_Engine_Swap_Mode Render_Engine_Swap_Mode
_evas_outbuf_swap_mode_get(Outbuf *ob) _evas_outbuf_swap_mode_get(Outbuf *ob)
{ {
Render_Engine_Swap_Mode mode;
int age; int age;
LOGFN(__FILE__, __LINE__, __FUNCTION__); LOGFN(__FILE__, __LINE__, __FUNCTION__);
age = ob->surface->funcs.assign(ob->surface); age = ob->surface->funcs.assign(ob->surface);
if (age == 1) mode = MODE_COPY; if (age == 1) return MODE_COPY;
else if (age == 2) mode = MODE_DOUBLE; else if (age == 2) return MODE_DOUBLE;
else if (age == 3) mode = MODE_TRIPLE; else if (age == 3) return MODE_TRIPLE;
else if (age == 4) mode = MODE_QUADRUPLE; else if (age == 4) return MODE_QUADRUPLE;
else mode = MODE_FULL;
if (ob->prev_age != age) mode = MODE_FULL; return MODE_FULL;
ob->prev_age = age;
return mode;
} }
int int