diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-24 19:59:47 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-24 19:59:47 +0200 |
| commit | 557effd46806f6d7355d2ff56f92eeffe7d00542 (patch) | |
| tree | 34a765edff3868a5448fded51e77ca1b3eb02561 /src | |
| parent | 30a701f9910da38b35d0db52c8ad24f983b2d171 (diff) | |
| parent | 2c76b37d553ae1cdb8a75cb6ead32b64ab2821db (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I789a424e020145a89b5789c3d16bdff8089c0176
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/qtcanvas3d/context3d.cpp | 20 | ||||
| -rw-r--r-- | src/imports/qtcanvas3d/doc/qtcanvas3d.qdocconf | 2 |
2 files changed, 10 insertions, 12 deletions
diff --git a/src/imports/qtcanvas3d/context3d.cpp b/src/imports/qtcanvas3d/context3d.cpp index 9d79e6f..c300772 100644 --- a/src/imports/qtcanvas3d/context3d.cpp +++ b/src/imports/qtcanvas3d/context3d.cpp @@ -4521,22 +4521,20 @@ QJSValue CanvasContext::getParameter(glEnums pname) case COMPRESSED_TEXTURE_FORMATS: { syncCommand.i1 = GLint(GL_NUM_COMPRESSED_TEXTURE_FORMATS); scheduleSyncCommand(&syncCommand); + QV4::Scope scope(m_v4engine); + QV4::Scoped<QV4::ArrayBuffer> buffer(scope, + m_v4engine->newArrayBuffer(sizeof(int) * value)); if (value > 0) { - QV4::Scope scope(m_v4engine); - QV4::Scoped<QV4::ArrayBuffer> buffer(scope, - m_v4engine->newArrayBuffer(sizeof(int) * value)); - syncCommand.i1 = GLint(pname); syncCommand.returnValue = buffer->data(); scheduleSyncCommand(&syncCommand); - - QV4::ScopedFunctionObject constructor(scope, - m_v4engine->typedArrayCtors[ - QV4::Heap::TypedArray::UInt32Array]); - QV4::ScopedCallData callData(scope, 1); - callData->args[0] = buffer; - return QJSValue(m_v4engine, constructor->construct(callData)); } + QV4::ScopedFunctionObject constructor(scope, + m_v4engine->typedArrayCtors[ + QV4::Heap::TypedArray::UInt32Array]); + QV4::ScopedCallData callData(scope, 1); + callData->args[0] = buffer; + return QJSValue(m_v4engine, constructor->construct(callData)); } case FRAMEBUFFER_BINDING: { return m_engine->newQObject(m_currentFramebuffer); diff --git a/src/imports/qtcanvas3d/doc/qtcanvas3d.qdocconf b/src/imports/qtcanvas3d/doc/qtcanvas3d.qdocconf index c0a7ae4..7a9cdf3 100644 --- a/src/imports/qtcanvas3d/doc/qtcanvas3d.qdocconf +++ b/src/imports/qtcanvas3d/doc/qtcanvas3d.qdocconf @@ -11,7 +11,7 @@ imagedirs += images headerdirs += .. sourcedirs += .. -examplesinstallpath = qtcanvas3d/canvas3d +examplesinstallpath = canvas3d depends = qtcore qtgui qtqml qtquick qtquickcontrols qtquicklayouts qtdoc qtmultimedia |