diff options
Diffstat (limited to 'src/render/frontend/qrenderaspect.cpp')
| -rw-r--r-- | src/render/frontend/qrenderaspect.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp index 271eb9c11..7a51fa0e7 100644 --- a/src/render/frontend/qrenderaspect.cpp +++ b/src/render/frontend/qrenderaspect.cpp @@ -170,10 +170,8 @@ #include <Qt3DCore/QAspectEngine> #include <Qt3DCore/private/qservicelocator_p.h> -#include <QDebug> -#include <QOffscreenSurface> #include <QThread> -#include <QWindow> +#include <QOpenGLContext> QT_BEGIN_NAMESPACE @@ -202,11 +200,16 @@ QRenderAspectPrivate::QRenderAspectPrivate(QRenderAspect::RenderType type) , m_nodeManagers(nullptr) , m_renderer(nullptr) , m_initialized(false) + , m_renderAfterJobs(false) , m_renderType(type) , m_offscreenHelper(nullptr) { m_instances.append(this); loadSceneParsers(); + if (m_renderType == QRenderAspect::Threaded && !QOpenGLContext::supportsThreadedOpenGL()) { + m_renderType = QRenderAspect::Synchronous; + m_renderAfterJobs = true; + } } /*! \internal */ @@ -239,6 +242,13 @@ void QRenderAspectPrivate::syncDirtyFrontEndNode(QNode *node, QBackendNode *back renderBackend->syncFromFrontEnd(node, firstTime); } +void QRenderAspectPrivate::jobsDone(QAspectManager *manager) +{ + m_renderer->jobsDone(manager); + if (m_renderAfterJobs) + m_renderer->doRender(true); +} + /*! \internal */ void QRenderAspectPrivate::registerBackendTypes() { @@ -546,6 +556,8 @@ QVariant QRenderAspect::executeCommand(const QStringList &args) void QRenderAspect::onEngineStartup() { Q_D(QRenderAspect); + if (d->m_renderAfterJobs) // synchronous rendering but using QWindow + d->m_renderer->initialize(); Render::NodeManagers *managers = d->m_renderer->nodeManagers(); Render::Entity *rootEntity = managers->lookupResource<Render::Entity, Render::EntityManager>(rootEntityId()); Q_ASSERT(rootEntity); |