summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorn Potter <lorn.potter@gmail.com>2018-06-06 13:49:37 +1000
committerLorn Potter <lorn.potter@gmail.com>2018-06-06 07:01:29 +0000
commit6c75a6589f45d60c27ca52ba951266632e0c1cae (patch)
tree958a99da10a7a715544063961342d3d8069ee65a
parent3ca5f33c8b9c273f0169ec4c11417328f8071e97 (diff)
wasm: fix using separate index buffer
html5 platform is webgl, so we share needing separate index buffers Change-Id: Ic0d09d1ee9274f6a487923bb43d42f06ff6806c5 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
-rw-r--r--src/quick/scenegraph/qsgdefaultrendercontext.cpp3
-rw-r--r--src/quick/scenegraph/scenegraph.pri1
2 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/scenegraph/qsgdefaultrendercontext.cpp b/src/quick/scenegraph/qsgdefaultrendercontext.cpp
index 22e97a2dc9..a6459dbd78 100644
--- a/src/quick/scenegraph/qsgdefaultrendercontext.cpp
+++ b/src/quick/scenegraph/qsgdefaultrendercontext.cpp
@@ -325,7 +325,8 @@ bool QSGDefaultRenderContext::separateIndexBuffer() const
// lifetime. An attempt to bind a buffer object to the other
// target will generate an INVALID_OPERATION error, and the
// current binding will remain untouched.
- static const bool isWebGL = qGuiApp->platformName().compare(QLatin1String("webgl")) == 0;
+ static const bool isWebGL = (qGuiApp->platformName().compare(QLatin1String("webgl")) == 0
+ || qGuiApp->platformName().compare(QLatin1String("html5")) == 0);
return isWebGL;
}
diff --git a/src/quick/scenegraph/scenegraph.pri b/src/quick/scenegraph/scenegraph.pri
index a9a71b1324..4f98638487 100644
--- a/src/quick/scenegraph/scenegraph.pri
+++ b/src/quick/scenegraph/scenegraph.pri
@@ -1,5 +1,4 @@
# DEFINES += QSG_DISTANCEFIELD_CACHE_DEBUG
-emscripten: DEFINES += QSG_SEPARATE_INDEX_BUFFER
# Core API
HEADERS += \