diff options
author | Andy Shaw <andy.shaw@qt.io> | 2019-10-09 11:14:36 +0200 |
---|---|---|
committer | Andy Shaw <andy.shaw@qt.io> | 2019-10-10 15:19:49 +0200 |
commit | 93aa379ae5cf624f024aa9173ce42e90b5c58002 (patch) | |
tree | e4daef84bdd097935f8aa082f6904fff35515f16 /src/quick3d/quick3dextras | |
parent | e628cf90be9eef43d7a80a35067a5f4a6ef80809 (diff) |
Make sure right screen is set on QOpenGLContext and QOffscreenSurface
When the Qt3D window is on a specific screen, then it needs to ensure
that any supporting QOpenGLContexts and QOffscreenSurfaces are set to
be using that same screen or it will fail to render the content.
Change-Id: Ief4f3e88bf6f71862bc5dace0cb0bddcdf3a98b5
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/quick3d/quick3dextras')
-rw-r--r-- | src/quick3d/quick3dextras/qt3dquickwindow.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quick3d/quick3dextras/qt3dquickwindow.cpp b/src/quick3d/quick3dextras/qt3dquickwindow.cpp index bc4bb25ee..d67dfdc71 100644 --- a/src/quick3d/quick3dextras/qt3dquickwindow.cpp +++ b/src/quick3d/quick3dextras/qt3dquickwindow.cpp @@ -66,6 +66,7 @@ #include <Qt3DQuickExtras/private/qt3dquickwindowlogging_p.h> #include <Qt3DRender/private/qrendersurfaceselector_p.h> +#include <Qt3DRender/private/qrenderaspect_p.h> QT_BEGIN_NAMESPACE @@ -132,6 +133,8 @@ Qt3DQuickWindow::Qt3DQuickWindow(QWindow *parent) QSurfaceFormat::setDefaultFormat(format); d->m_renderAspect = new Qt3DRender::QRenderAspect; + if (parent && parent->screen()) + static_cast<Qt3DRender::QRenderAspectPrivate*>(Qt3DRender::QRenderAspectPrivate::get(d->m_renderAspect))->m_screen = parent->screen(); d->m_inputAspect = new Qt3DInput::QInputAspect; d->m_logicAspect = new Qt3DLogic::QLogicAspect; d->m_engine = new Qt3DCore::Quick::QQmlAspectEngine; |