From 6c75a6589f45d60c27ca52ba951266632e0c1cae Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Wed, 6 Jun 2018 13:49:37 +1000 Subject: wasm: fix using separate index buffer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit html5 platform is webgl, so we share needing separate index buffers Change-Id: Ic0d09d1ee9274f6a487923bb43d42f06ff6806c5 Reviewed-by: Morten Johan Sørvig --- src/quick/scenegraph/qsgdefaultrendercontext.cpp | 3 ++- src/quick/scenegraph/scenegraph.pri | 1 - 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 += \ -- cgit v1.2.3