1 files changed, 14 insertions, 1 deletions
diff --git a/src/render/renderers/opengl/renderer/renderer_p.h b/src/render/renderers/opengl/renderer/renderer_p.h
index 23708e3e8..93d6fdbfa 100644
--- a/src/render/renderers/opengl/renderer/renderer_p.h
+++ b/src/render/renderers/opengl/renderer/renderer_p.h
@@ -80,6 +80,7 @@
 #include <Qt3DRender/private/updateentitylayersjob_p.h>
 #include <Qt3DRender/private/renderercache_p.h>
 #include <Qt3DRender/private/texture_p.h>
+#include <Qt3DRender/private/glfence_p.h>
 
 #include <QHash>
 #include <QMatrix4x4>
@@ -96,6 +97,10 @@
 
 #include <functional>
 
+#if defined(QT_BUILD_INTERNAL)
+class tst_Renderer;
+#endif
+
 QT_BEGIN_NAMESPACE
 
 class QSurface;
@@ -195,6 +200,7 @@ public:
     bool shouldRender() override;
     void skipNextFrame() override;
 
+    QVector<Qt3DCore::QAspectJobPtr> preRenderingJobs() override;
     QVector<Qt3DCore::QAspectJobPtr> renderBinJobs() override;
     Qt3DCore::QAspectJobPtr pickBoundingVolumeJob() override;
     Qt3DCore::QAspectJobPtr rayCastingJob() override;
@@ -373,6 +379,7 @@ private:
     GenericLambdaJobPtr<std::function<void ()>> m_vaoGathererJob;
     GenericLambdaJobPtr<std::function<void ()>> m_textureGathererJob;
     GenericLambdaJobPtr<std::function<void ()>> m_sendTextureChangesToFrontendJob;
+    GenericLambdaJobPtr<std::function<void ()>> m_sendSetFenceHandlesToFrontendJob;
     IntrospectShadersJobPtr m_introspectShaderJob;
 
     SynchronizerJobPtr m_syncTextureLoadingJob;
@@ -383,6 +390,7 @@ private:
     void lookForDirtyTextures();
     void reloadDirtyShaders();
     void sendTextureChangesToFrontend();
+    void sendSetFenceHandlesToFrontend();
 
     QMutex m_abandonedVaosMutex;
     QVector<HVao> m_abandonedVaos;
@@ -391,7 +399,8 @@ private:
     QVector<HBuffer> m_downloadableBuffers;
     QVector<HShader> m_dirtyShaders;
     QVector<HTexture> m_dirtyTextures;
-    QVector<QPair<TextureProperties, Qt3DCore::QNodeIdVector>> m_updatedTextureProperties;
+    QVector<QPair<Texture::TextureUpdateInfo, Qt3DCore::QNodeIdVector>> m_updatedTextureProperties;
+    QVector<QPair<Qt3DCore::QNodeId, GLFence>> m_updatedSetFences;
 
     bool m_ownedContext;
 
@@ -403,6 +412,10 @@ private:
     friend class Qt3DRender::Debug::CommandExecuter;
 #endif
 
+#ifdef QT_BUILD_INTERNAL
+    friend class ::tst_Renderer;
+#endif
+
     QMetaObject::Connection m_contextConnection;
     RendererCache m_cache;
 };