1 files changed, 43 insertions, 4 deletions
diff --git a/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp b/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp
index dc1e85b8e..d1ac853ea 100644
--- a/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp
+++ b/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp
@@ -929,10 +929,22 @@ int SubmissionContext::activateTexture(TextureScope scope, GLTexture *tex, int o
     // Note: tex->dna() could be 0 if the texture has not been created yet
     if (m_activeTextures[onUnit].texture != tex) {
         // Texture must have been created and updated at this point
-        QOpenGLTexture *glTex = tex->getGLTexture();
-        if (glTex == nullptr)
-            return -1;
-        glTex->bind(onUnit);
+
+        const int sharedTextureId = tex->sharedTextureId();
+
+        // We have a valid texture id provided by a shared context
+        if (sharedTextureId > 0) {
+            m_gl->functions()->glActiveTexture(GL_TEXTURE0 + onUnit);
+            const QAbstractTexture::Target target = tex->properties().target;
+            // For now we know that target values correspond to the GL values
+            m_gl->functions()->glBindTexture(target, tex->sharedTextureId());
+        } else {
+            QOpenGLTexture *glTex = tex->getGLTexture();
+            if (glTex == nullptr)
+                return -1;
+            glTex->bind(onUnit);
+        }
+
         if (m_activeTextures[onUnit].texture)
             TextureExtRendererLocker::unlock(m_activeTextures[onUnit].texture);
         m_activeTextures[onUnit].texture = tex;
@@ -1249,6 +1261,33 @@ void SubmissionContext::clearStencilValue(int stencil)
     }
 }
 
+GLFence SubmissionContext::fenceSync()
+{
+    return m_glHelper->fenceSync();
+}
+
+void SubmissionContext::clientWaitSync(GLFence sync, GLuint64 nanoSecTimeout)
+{
+    qDebug() << Q_FUNC_INFO << sync;
+    m_glHelper->clientWaitSync(sync, nanoSecTimeout);
+}
+
+void SubmissionContext::waitSync(GLFence sync)
+{
+    qDebug() << Q_FUNC_INFO << sync;
+    m_glHelper->waitSync(sync);
+}
+
+bool SubmissionContext::wasSyncSignaled(GLFence sync)
+{
+    return m_glHelper->wasSyncSignaled(sync);
+}
+
+void SubmissionContext::deleteSync(GLFence sync)
+{
+    m_glHelper->deleteSync(sync);
+}
+
 // It will be easier if the QGraphicContext applies the QUniformPack
 // than the other way around
 bool SubmissionContext::setParameters(ShaderParameterPack &parameterPack)