aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2018-03-14 12:08:52 -0500
committerDerek Foreman <derekf@osg.samsung.com>2018-03-14 16:10:14 -0500
commit984d8bd4ce6fd13a3e9ac7dd909b7bef123bb2b8 (patch)
tree8cd54832324be43e65b321cb28a7ed79abc8232e
parentevas_render: Don't render from norender (diff)
downloadefl-984d8bd4ce6fd13a3e9ac7dd909b7bef123bb2b8.tar.gz
ecore_wl2_window: Silence some spurious warnings
ecore_wl2_window_commit() must be called during window size negotiation, but this currently trips a warning when no frame callback has been received for the first commit. We can't even have frame callbacks at that point because no buffer is attached. Don't set up the commit_pending logic until after we have a buffer.
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_window.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c b/src/lib/ecore_wl2/ecore_wl2_window.c
index a9f78a5223..3f4bf96547 100644
--- a/src/lib/ecore_wl2/ecore_wl2_window.c
+++ b/src/lib/ecore_wl2/ecore_wl2_window.c
@@ -1632,7 +1632,8 @@ ecore_wl2_window_commit(Ecore_Wl2_Window *window, Eina_Bool flush)
}
if (!window->pending.configure)
{
- window->commit_pending = EINA_TRUE;
+ if (window->has_buffer)
+ window->commit_pending = EINA_TRUE;
window->callback = wl_surface_frame(window->surface);
wl_callback_add_listener(window->callback, &_frame_listener, window);
/* Dispatch any state we've been saving along the way */
@@ -1707,7 +1708,8 @@ ecore_wl2_window_false_commit(Ecore_Wl2_Window *window)
wl_callback_add_listener(window->callback, &_frame_listener, window);
wl_surface_commit(window->surface);
ecore_wl2_display_flush(window->display);
- window->commit_pending = EINA_TRUE;
+ if (window->has_buffer)
+ window->commit_pending = EINA_TRUE;
}
EAPI Eina_Bool