diff options
Diffstat (limited to 'src/effects/private/qgfxshaderbuilder.cpp')
| -rw-r--r-- | src/effects/private/qgfxshaderbuilder.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/effects/private/qgfxshaderbuilder.cpp b/src/effects/private/qgfxshaderbuilder.cpp index 0d04681..87b1a45 100644 --- a/src/effects/private/qgfxshaderbuilder.cpp +++ b/src/effects/private/qgfxshaderbuilder.cpp @@ -61,6 +61,9 @@ QGfxShaderBuilder::QGfxShaderBuilder() // GL context's format on to the offscreen format. surface.setFormat(context.format()); surface.create(); + + QOpenGLContext *oldContext = QOpenGLContext::currentContext(); + QSurface *oldSurface = oldContext ? oldContext->surface() : 0; if (context.makeCurrent(&surface)) { QOpenGLFunctions *gl = context.functions(); if (context.isOpenGLES()) { @@ -74,7 +77,10 @@ QGfxShaderBuilder::QGfxShaderBuilder() gl->glGetIntegerv(GL_MAX_VARYING_FLOATS, &floats); m_maxBlurSamples = floats / 2.0; } - context.doneCurrent(); + if (oldContext && oldSurface) + oldContext->makeCurrent(oldSurface); + else + context.doneCurrent(); } else { qDebug() << "failed to acquire GL context to resolve capabilities, using defaults.."; m_maxBlurSamples = 8; // minimum number of varyings in the ES 2.0 spec. |