Improve the frame callbacks handling

Improve the way wl_surface's frame callbacks are handled. The sooner
they are sent the better is for the clients, as they have more time to
render the next frame, but reducing the time for the compositor to
render its frame. The best compromise is probably to send them out
after the compositor has issued its GL calls but before calling
eglSwapBuffers(), and before the GPU actually draws anything.
Rename the function to send the callbacks to only reflect its purpose,
leaving the compositors free to choose when they want to send them.

Change-Id: Ifcdfcad9e54b4d07d5c087898123ac724395a194
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>

1 files changed, 4 insertions, 16 deletions

diff --git a/src/compositor/wayland_wrapper/qwlcompositor.cpp b/src/compositor/wayland_wrapper/qwlcompositor.cpp
index 8a7b1617d..7d5cd35f1 100644
--- a/src/compositor/wayland_wrapper/qwlcompositor.cpp
+++ b/src/compositor/wayland_wrapper/qwlcompositor.cpp
@@ -242,16 +242,10 @@ Compositor::~Compositor()
     delete m_display;
 }
 
-void Compositor::frameFinished(Surface *surface)
-{
-    if (surface && m_dirty_surfaces.contains(surface)) {
-        m_dirty_surfaces.remove(surface);
-        surface->sendFrameCallback();
-    } else if (!surface) {
-        QSet<Surface *> dirty = m_dirty_surfaces;
-        m_dirty_surfaces.clear();
-        foreach (Surface *surface, dirty)
-            surface->sendFrameCallback();
+void Compositor::sendFrameCallbacks(QList<QWaylandSurface *> visibleSurfaces)
+{
+    foreach (QWaylandSurface *surface, visibleSurfaces) {
+        surface->handle()->sendFrameCallback();
     }
 }
 
@@ -294,7 +288,6 @@ void Compositor::destroySurface(Surface *surface)
         dev->setKeyboardFocus(0);
 
     m_surfaces.removeOne(surface);
-    m_dirty_surfaces.remove(surface);
 
     waylandCompositor()->surfaceAboutToBeDestroyed(surface->waylandSurface());
 
@@ -312,11 +305,6 @@ void Compositor::cleanupGraphicsResources()
     m_destroyed_surfaces.clear();
 }
 
-void Compositor::markSurfaceAsDirty(QtWayland::Surface *surface)
-{
-    m_dirty_surfaces.insert(surface);
-}
-
 void Compositor::destroyClient(WaylandClient *c)
 {
     wl_client *client = static_cast<wl_client *>(c);