diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-06-12 21:29:08 +0100 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2020-06-12 22:35:03 +0100 |
| commit | f03afcf1a19c48dd1d95ba421f7d90f9e2cdc1cc (patch) | |
| tree | d213ea47e26dca859eb7755074a3378cf8dce616 | |
| parent | d604120720850533cb95d69ce37dfadf00fd03ba (diff) | |
| download | qt3d-f03afcf1a19c48dd1d95ba421f7d90f9e2cdc1cc.tar.gz | |
Update dependencies
Commented out calls to resetOpenGLState which has moved in QtDeclarative.
Leaves Scene3D and Scene2D in broken state.
Change-Id: Ib1a5dcdde34c1bb177518dd891d123d3a5322d9d
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| -rw-r--r-- | dependencies.yaml | 7 | ||||
| -rw-r--r-- | src/quick3d/imports/scene3d/scene3drenderer.cpp | 6 | ||||
| -rw-r--r-- | src/quick3d/quick3dscene2d/items/scene2d.cpp | 3 |
3 files changed, 9 insertions, 7 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index bf45952b4..b85b2ec4c 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,14 +1,13 @@ dependencies: ../qtbase: - ref: ad532ce118b7052be3b69999cef2eb610e66fa88 + ref: 03dfd4199deb4a0f5123fb1eead42f7e1f85e9e3 required: true ../qtdeclarative: - ref: 11a09e212877988d37416842ad73d9aa357ba51f + ref: 2a091e78d2a9d18fe4d2dc3e2927a098c8aa5e06 required: true ../qtshadertools: - ref: 9ed3dc95316792d6331ede9facc03d294d878ccc + ref: e37d776d8a90b3abc94eeea8e625c4d3b989fb56 required: true -# ../qtgamepad: # ref: fb20a2012e650917e294d1614ec17d3b01404b25 # required: false # ../qtimageformats: diff --git a/src/quick3d/imports/scene3d/scene3drenderer.cpp b/src/quick3d/imports/scene3d/scene3drenderer.cpp index a39cfd43d..0a244da5b 100644 --- a/src/quick3d/imports/scene3d/scene3drenderer.cpp +++ b/src/quick3d/imports/scene3d/scene3drenderer.cpp @@ -413,7 +413,8 @@ void Scene3DRenderer::render() // The OpenGL state may be dirty from the previous QtQuick nodes, so reset // it here to give Qt3D the clean state it expects - m_window->resetOpenGLState(); + // TODOQT6 Restore functionality +// m_window->resetOpenGLState(); // Create and bind FBO if using the FBO compositing mode const bool usesFBO = m_compositingMode == Scene3DItem::FBO; @@ -457,7 +458,8 @@ void Scene3DRenderer::render() // Reset the state used by the Qt Quick scenegraph to avoid any // interference when rendering the rest of the UI. - m_window->resetOpenGLState(); + // TODOQT6 Restore functionality +// m_window->resetOpenGLState(); } } // namespace Qt3DRender diff --git a/src/quick3d/quick3dscene2d/items/scene2d.cpp b/src/quick3d/quick3dscene2d/items/scene2d.cpp index 812edc79a..0e4db3485 100644 --- a/src/quick3d/quick3dscene2d/items/scene2d.cpp +++ b/src/quick3d/quick3dscene2d/items/scene2d.cpp @@ -361,7 +361,8 @@ void Scene2D::render() QCoreApplication::postEvent(m_sharedObject->m_renderManager, new Scene2DEvent(Scene2DEvent::Rendered)); - m_sharedObject->m_quickWindow->resetOpenGLState(); + // TODOQT6 Restore functionality +// m_sharedObject->m_quickWindow->resetOpenGLState(); m_context->functions()->glFlush(); if (texture->isAutoMipMapGenerationEnabled()) texture->generateMipMaps(); |