Fix before/after frame signal emissions

Make the before signal closer to the actual QRhi::beginFrame() call.
This fixes emitting a beforeFrameBegin unnecessarily when unexposing and
then exposing a window again.

Change-Id: Icc562a57798986c8d04c6800eabc41981c5da85b
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

1 files changed, 3 insertions, 2 deletions

diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp
index c2c17508f1..9d1217edf9 100644
--- a/src/quick/scenegraph/qsgrenderloop.cpp
+++ b/src/quick/scenegraph/qsgrenderloop.cpp
@@ -596,8 +596,6 @@ void QSGGuiThreadRenderLoop::renderWindow(QQuickWindow *window)
 
     emit window->afterAnimating();
 
-    emit window->beforeFrameBegin();
-
     // Begin the frame before syncing -> sync is where we may invoke
     // updatePaintNode() on the items and they may want to do resource updates.
     // Also relevant for applications that connect to the before/afterSynchronizing
@@ -629,6 +627,8 @@ void QSGGuiThreadRenderLoop::renderWindow(QQuickWindow *window)
             }
         }
 
+        emit window->beforeFrameBegin();
+
         Q_ASSERT(rhi == cd->rhi);
         // ### the flag should only be set when the app requests it, but there's no way to do that right now
         QRhi::BeginFrameFlags frameFlags = QRhi::ExternalContentsInPass;
@@ -639,6 +639,7 @@ void QSGGuiThreadRenderLoop::renderWindow(QQuickWindow *window)
             else if (frameResult == QRhi::FrameOpError)
                 qWarning("Failed to start frame");
             // out of date is not worth warning about - it may happen even during resizing on some platforms
+            emit window->afterFrameEnd();
             return;
         }
     }