diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2020-08-07 12:51:36 +0200 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2020-08-17 11:13:44 +0100 |
| commit | d63540bbd6330af2d614d55bfe6a288d116532c2 (patch) | |
| tree | bbb948548ea213c131419810afb4e388c050e80b | |
| parent | d89fc63d7216654f8a72db0c65344620a6e88080 (diff) | |
Update scene3drenderer to latest changes in qtdeclarative
Change-Id: I9b4a3e3afc1adeda014242ff8fd53ceac9ab5d85
Reviewed-by: Mike Krus <mike.krus@kdab.com>
| -rw-r--r-- | src/quick3d/imports/scene3d/scene3drenderer.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/quick3d/imports/scene3d/scene3drenderer.cpp b/src/quick3d/imports/scene3d/scene3drenderer.cpp index 051f08909..0d5d2cf5c 100644 --- a/src/quick3d/imports/scene3d/scene3drenderer.cpp +++ b/src/quick3d/imports/scene3d/scene3drenderer.cpp @@ -391,8 +391,7 @@ void Scene3DRenderer::GLRenderer::beforeSynchronize(Scene3DRenderer *scene3DRend if (generateNewTexture) { m_finalFBO.reset(createFramebufferObject(m_lastSize)); m_textureId = m_finalFBO->texture(); - m_texture.reset(window->createTextureFromNativeObject(QQuickWindow::NativeObjectTexture, m_textureId, - 0, m_finalFBO->size(), QQuickWindow::TextureHasAlphaChannel)); + m_texture.reset(QPlatformInterface::QSGOpenGLTexture::fromNative(m_textureId, window, m_finalFBO->size(), QQuickWindow::TextureHasAlphaChannel)); } // We can render either the Scene3D or the Scene3DView but not both @@ -606,9 +605,9 @@ void Scene3DRenderer::RHIRenderer::beforeSynchronize(Scene3DRenderer *scene3DRen m_rhiRenderTarget->create(); // Create QSGTexture from QRhiTexture - m_texture.reset(window->createTextureFromNativeObject(QQuickWindow::NativeObjectTexture, - m_rhiTexture->nativeTexture().object, - 0, m_lastSize, QQuickWindow::TextureHasAlphaChannel)); + auto *windowPriv = QQuickWindowPrivate::get(window); + m_texture.reset(windowPriv->createTextureFromNativeTexture(m_rhiTexture->nativeTexture().object, + 0, m_lastSize, QQuickWindow::TextureHasAlphaChannel)); // Set the Default RenderTarget to use on the RHI Renderer // Note: this will release all pipelines using previousRenderTarget |