derekf pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e3a3e020421cc571dc4a063a2dad5271e2606005
commit e3a3e020421cc571dc4a063a2dad5271e2606005 Author: Derek Foreman <[email protected]> Date: Thu Jan 25 15:58:35 2018 -0600 ecore_wl2: Add API for querying buffer lock status and use it Since surfaces will be managed by plug-ins, we need to make sure they don't rely on internal structures. --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 + src/lib/ecore_wl2/ecore_wl2_buffer.c | 8 ++++++++ src/lib/ecore_wl2/ecore_wl2_surface.c | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index 97ea966af3..1e8faa6cd3 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2007,6 +2007,7 @@ EAPI void ecore_wl2_buffer_unmap(Ecore_Wl2_Buffer *buf); EAPI void ecore_wl2_buffer_discard(Ecore_Wl2_Buffer *buf); EAPI void ecore_wl2_buffer_unlock(Ecore_Wl2_Buffer *b); EAPI void ecore_wl2_buffer_destroy(Ecore_Wl2_Buffer *b); +EAPI Eina_Bool ecore_wl2_buffer_busy_get(Ecore_Wl2_Buffer *buffer); EAPI Ecore_Wl2_Surface *ecore_wl2_surface_create(Ecore_Wl2_Window *win, Eina_Bool alpha); EAPI void ecore_wl2_surface_destroy(Ecore_Wl2_Surface *surface); diff --git a/src/lib/ecore_wl2/ecore_wl2_buffer.c b/src/lib/ecore_wl2/ecore_wl2_buffer.c index 4fa905e5ff..55b665d4ae 100644 --- a/src/lib/ecore_wl2/ecore_wl2_buffer.c +++ b/src/lib/ecore_wl2/ecore_wl2_buffer.c @@ -672,6 +672,14 @@ ecore_wl2_buffer_destroy(Ecore_Wl2_Buffer *b) free(b); } +EAPI Eina_Bool +ecore_wl2_buffer_busy_get(Ecore_Wl2_Buffer *buffer) +{ + EINA_SAFETY_ON_NULL_RETURN_VAL(buffer, EINA_FALSE); + + return (buffer->locked) || (buffer->busy); +} + static Ecore_Wl2_Buffer * _ecore_wl2_buffer_partial_create(int w, int h, Eina_Bool alpha) { diff --git a/src/lib/ecore_wl2/ecore_wl2_surface.c b/src/lib/ecore_wl2/ecore_wl2_surface.c index b7cda2f7a3..ff561c2edf 100644 --- a/src/lib/ecore_wl2/ecore_wl2_surface.c +++ b/src/lib/ecore_wl2/ecore_wl2_surface.c @@ -87,7 +87,7 @@ _evas_dmabuf_surface_wait(Ecore_Wl2_Surface *s) EINA_LIST_FOREACH(s->buffers, l, b) { - if (b->locked || b->busy) continue; + if (ecore_wl2_buffer_busy_get(b)) continue; if (b->age > best_age) { best = b; --
