diff options
| author | Gunnar Sletta <gunnar.sletta@jollamobile.com> | 2014-07-30 16:31:36 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@jollamobile.com> | 2014-08-01 23:16:04 +0200 |
| commit | ba193b94c6822ba382e2dc69cae60c6833f5cc9d (patch) | |
| tree | bcfb7078c0d076e66644a93938401259420d2960 | |
| parent | d676b0ec019a34b639a11ab224f226e678f272ce (diff) | |
Use the current context to resolve extensions.
When updating the code to not use direct gl calls, this
code was changed to use the context's gl context. The
context doesn't have a context when the rendering happens
on the same thread as the scene graph rendering and
we get a crash.
Change-Id: I8adf62c0ed12bb055982a71ba59af76afeefcca1
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2dtexture.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/context2d/qquickcontext2dtexture.cpp b/src/quick/items/context2d/qquickcontext2dtexture.cpp index ef1b65a04f..ca66bd7f5a 100644 --- a/src/quick/items/context2d/qquickcontext2dtexture.cpp +++ b/src/quick/items/context2d/qquickcontext2dtexture.cpp @@ -479,7 +479,7 @@ bool QQuickContext2DFBOTexture::doMultisampling() const static bool multisamplingSupported = false; if (!extensionsChecked) { - const QSet<QByteArray> extensions = m_context->glContext()->extensions(); + const QSet<QByteArray> extensions = QOpenGLContext::currentContext()->extensions(); multisamplingSupported = extensions.contains(QByteArrayLiteral("GL_EXT_framebuffer_multisample")) && extensions.contains(QByteArrayLiteral("GL_EXT_framebuffer_blit")); extensionsChecked = true; |