diff options
| author | Lorn Potter <lorn.potter@gmail.com> | 2018-04-10 13:25:06 +1000 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-04-23 10:48:08 +0000 |
| commit | 176b62f327198166c4dc691606d562724ea438b6 (patch) | |
| tree | e14d36263100bba106860a3607de1422509f3df9 /src/quick/scenegraph | |
| parent | 0abec22f157e0931ce2622bd81d536028c9dd734 (diff) | |
webassembly: use default opengl backend
Change-Id: Iaaa9776846ae10f5f4b04f2fd4da52deeac66f0a
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/quick/scenegraph')
| -rw-r--r-- | src/quick/scenegraph/qsgcontextplugin.cpp | 3 | ||||
| -rw-r--r-- | src/quick/scenegraph/qsgrenderloop.cpp | 4 | ||||
| -rw-r--r-- | src/quick/scenegraph/scenegraph.pri | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/quick/scenegraph/qsgcontextplugin.cpp b/src/quick/scenegraph/qsgcontextplugin.cpp index 31f1c4c722..628619fa46 100644 --- a/src/quick/scenegraph/qsgcontextplugin.cpp +++ b/src/quick/scenegraph/qsgcontextplugin.cpp @@ -135,9 +135,6 @@ QSGAdaptationBackendData *contextFactory() && !QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::OpenGL)) { requestedBackend = QString::fromLocal8Bit("software"); } -#ifdef Q_OS_HTML5 - requestedBackend = QString::fromLocal8Bit("software"); -#endif if (!requestedBackend.isEmpty()) { qCDebug(QSG_LOG_INFO, "Loading backend %s", qUtf8Printable(requestedBackend)); diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp index 8130272295..a55b7b4ad9 100644 --- a/src/quick/scenegraph/qsgrenderloop.cpp +++ b/src/quick/scenegraph/qsgrenderloop.cpp @@ -207,6 +207,7 @@ QSGRenderLoop *QSGRenderLoop::instance() if (QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL)) loopType = ThreadedRenderLoop; #endif + if (qmlNoThreadedRenderer()) loopType = BasicRenderLoop; else if (qmlForceThreadedRenderer()) @@ -469,6 +470,9 @@ void QSGGuiThreadRenderLoop::renderWindow(QQuickWindow *window) // Might have been set during syncSceneGraph() if (data.updatePending) maybeUpdate(window); +#ifdef Q_OS_HTML5 + QCoreApplication::processEvents(QEventLoop::EventLoopExec); +#endif } void QSGGuiThreadRenderLoop::exposureChanged(QQuickWindow *window) diff --git a/src/quick/scenegraph/scenegraph.pri b/src/quick/scenegraph/scenegraph.pri index 4fa3e7b6bf..ac70c3153f 100644 --- a/src/quick/scenegraph/scenegraph.pri +++ b/src/quick/scenegraph/scenegraph.pri @@ -1,5 +1,6 @@ # DEFINES += QSG_SEPARATE_INDEX_BUFFER # DEFINES += QSG_DISTANCEFIELD_CACHE_DEBUG +emscripten: DEFINES += QSG_SEPARATE_INDEX_BUFFER # Core API HEADERS += \ |