diff options
Diffstat (limited to 'src/render')
-rw-r--r-- | src/render/backend/abstractrenderer_p.h | 3 | ||||
-rw-r--r-- | src/render/backend/offscreensurfacehelper.cpp | 1 | ||||
-rw-r--r-- | src/render/frontend/qrenderaspect.cpp | 1 | ||||
-rw-r--r-- | src/render/frontend/qrenderaspect_p.h | 2 | ||||
-rw-r--r-- | src/render/renderers/opengl/renderer/commandthread.cpp | 1 | ||||
-rw-r--r-- | src/render/renderers/opengl/renderer/renderer.cpp | 14 | ||||
-rw-r--r-- | src/render/renderers/opengl/renderer/renderer_p.h | 4 |
7 files changed, 26 insertions, 0 deletions
diff --git a/src/render/backend/abstractrenderer_p.h b/src/render/backend/abstractrenderer_p.h index 69e71dece..273ab359a 100644 --- a/src/render/backend/abstractrenderer_p.h +++ b/src/render/backend/abstractrenderer_p.h @@ -64,6 +64,7 @@ QT_BEGIN_NAMESPACE class QSurface; class QSize; +class QScreen; namespace Qt3DCore { class QAbstractFrameAdvanceService; @@ -177,6 +178,8 @@ public: // For QtQuick rendering virtual void setOpenGLContext(QOpenGLContext *ctx) = 0; + virtual void setScreen(QScreen *) {} + virtual QScreen *screen() const { return nullptr; } virtual void setOffscreenSurfaceHelper(OffscreenSurfaceHelper *helper) = 0; virtual QSurfaceFormat format() = 0; diff --git a/src/render/backend/offscreensurfacehelper.cpp b/src/render/backend/offscreensurfacehelper.cpp index 89dc6211f..38558d484 100644 --- a/src/render/backend/offscreensurfacehelper.cpp +++ b/src/render/backend/offscreensurfacehelper.cpp @@ -72,6 +72,7 @@ void OffscreenSurfaceHelper::createOffscreenSurface() m_offscreenSurface = new QOffscreenSurface; m_offscreenSurface->setParent(this); m_offscreenSurface->setFormat(m_renderer->format()); + m_offscreenSurface->setScreen(m_renderer->screen()); m_offscreenSurface->create(); } diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp index 14fbe1754..c60488e16 100644 --- a/src/render/frontend/qrenderaspect.cpp +++ b/src/render/frontend/qrenderaspect.cpp @@ -564,6 +564,7 @@ void QRenderAspect::onRegistered() // TO DO: Load proper Renderer class based on Qt configuration preferences d->m_renderer = new Render::Renderer(d->m_renderType); + d->m_renderer->setScreen(d->m_screen); d->m_renderer->setNodeManagers(d->m_nodeManagers); // Create a helper for deferring creation of an offscreen surface used during cleanup diff --git a/src/render/frontend/qrenderaspect_p.h b/src/render/frontend/qrenderaspect_p.h index 4a091e164..28a9b2453 100644 --- a/src/render/frontend/qrenderaspect_p.h +++ b/src/render/frontend/qrenderaspect_p.h @@ -60,6 +60,7 @@ QT_BEGIN_NAMESPACE class QSurface; +class QScreen; namespace Qt3DRender { @@ -104,6 +105,7 @@ public: QVector<Render::QRenderPlugin *> m_renderPlugins; QRenderAspect::RenderType m_renderType; Render::OffscreenSurfaceHelper *m_offscreenHelper; + QScreen *m_screen = nullptr; static QMutex m_pluginLock; static QVector<QString> m_pluginConfig; diff --git a/src/render/renderers/opengl/renderer/commandthread.cpp b/src/render/renderers/opengl/renderer/commandthread.cpp index dcaacadcc..70ab964d6 100644 --- a/src/render/renderers/opengl/renderer/commandthread.cpp +++ b/src/render/renderers/opengl/renderer/commandthread.cpp @@ -97,6 +97,7 @@ void CommandThread::initialize(QOpenGLContext *mainContext, OffscreenSurfaceHelp // thread the wglShareLists call is made on) m_localContext.reset(new QOpenGLContext()); m_localContext->setFormat(m_mainContext->format()); + m_localContext->setScreen(m_mainContext->screen()); m_localContext->setShareContext(m_mainContext); if (!m_localContext->create()) qWarning("CommandThread: Failed to create local context"); diff --git a/src/render/renderers/opengl/renderer/renderer.cpp b/src/render/renderers/opengl/renderer/renderer.cpp index b4a19c641..d0b1f2a5d 100644 --- a/src/render/renderers/opengl/renderer/renderer.cpp +++ b/src/render/renderers/opengl/renderer/renderer.cpp @@ -357,6 +357,16 @@ void Renderer::setOpenGLContext(QOpenGLContext *context) m_glContext = context; } +void Renderer::setScreen(QScreen *scr) +{ + m_screen = scr; +} + +QScreen *Renderer::screen() const +{ + return m_screen; +} + // Called in RenderThread context by the run method of RenderThread // RenderThread has locked the mutex already and unlocks it when this // method termintates @@ -374,6 +384,8 @@ void Renderer::initialize() // we need to create it if (!m_glContext) { ctx = new QOpenGLContext; + if (m_screen) + ctx->setScreen(m_screen); ctx->setShareContext(qt_gl_global_share_context()); // TO DO: Shouldn't we use the highest context available and trust @@ -403,6 +415,8 @@ void Renderer::initialize() if (!ctx->shareContext()) { m_shareContext = new QOpenGLContext; + if (ctx->screen()) + m_shareContext->setScreen(ctx->screen()); m_shareContext->setFormat(ctx->format()); m_shareContext->setShareContext(ctx); m_shareContext->create(); diff --git a/src/render/renderers/opengl/renderer/renderer_p.h b/src/render/renderers/opengl/renderer/renderer_p.h index 5b5f5c4f4..9376e9eda 100644 --- a/src/render/renderers/opengl/renderer/renderer_p.h +++ b/src/render/renderers/opengl/renderer/renderer_p.h @@ -106,6 +106,7 @@ QT_BEGIN_NAMESPACE class QSurface; class QMouseEvent; +class QScreen; namespace Qt3DCore { class QEntity; @@ -294,6 +295,8 @@ public: ViewSubmissionResultData submitRenderViews(const QVector<Render::RenderView *> &renderViews); RendererCache *cache() { return &m_cache; } + void setScreen(QScreen *scr) override; + QScreen *screen() const override; #ifdef QT3D_RENDER_UNIT_TESTS public: @@ -421,6 +424,7 @@ private: QMetaObject::Connection m_contextConnection; RendererCache m_cache; + QScreen *m_screen = nullptr; }; } // namespace Render |