Make openglunderqml functional with and without the rhi

It has to be written following the new split approach (beforeRendering
for resource setup, beforeRenderPassRecording to issue the actual
underlay draw calls), but it will then work both with and
without QSG_RHI=1.

Change-Id: I9b7b35434aa0caec543cae268064b2684256382d
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 22 insertions, 6 deletions

diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp
index a5d9391034..97fd49e4c7 100644
--- a/src/quick/scenegraph/qsgcontext.cpp
+++ b/src/quick/scenegraph/qsgcontext.cpp
@@ -341,11 +341,27 @@ void QSGRenderContext::invalidate()
 {
 }
 
-void QSGRenderContext::beginRhiFrame(QSGRenderer *renderer, QRhiRenderTarget *rt, QRhiRenderPassDescriptor *rp,
-                                     QRhiCommandBuffer *cb,
-                                     RenderPassCallback mainPassRecordingStart,
-                                     RenderPassCallback mainPassRecordingEnd,
-                                     void *callbackUserData)
+void QSGRenderContext::beginNextFrame(QSGRenderer *renderer,
+                                      RenderPassCallback mainPassRecordingStart,
+                                      RenderPassCallback mainPassRecordingEnd,
+                                      void *callbackUserData)
+{
+    Q_UNUSED(renderer);
+    Q_UNUSED(mainPassRecordingStart);
+    Q_UNUSED(mainPassRecordingEnd);
+    Q_UNUSED(callbackUserData);
+}
+
+void QSGRenderContext::endNextFrame(QSGRenderer *renderer)
+{
+    Q_UNUSED(renderer);
+}
+
+void QSGRenderContext::beginNextRhiFrame(QSGRenderer *renderer,
+                                         QRhiRenderTarget *rt, QRhiRenderPassDescriptor *rp, QRhiCommandBuffer *cb,
+                                         RenderPassCallback mainPassRecordingStart,
+                                         RenderPassCallback mainPassRecordingEnd,
+                                         void *callbackUserData)
 {
     Q_UNUSED(renderer);
     Q_UNUSED(rt);
@@ -361,7 +377,7 @@ void QSGRenderContext::renderNextRhiFrame(QSGRenderer *renderer)
     Q_UNUSED(renderer);
 }
 
-void QSGRenderContext::endRhiFrame(QSGRenderer *renderer)
+void QSGRenderContext::endNextRhiFrame(QSGRenderer *renderer)
 {
     Q_UNUSED(renderer);
 }