diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-11-09 02:58:48 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-11-09 02:58:48 (GMT) |
| commit | 09a123c7f9df37f82a4baab0e7ec70ebfe5444d3 (patch) | |
| tree | b3776844cbee3c3223b54d7cd836e3c1d75fbb9a | |
| parent | f89fc92d1da06964a890e7800caeab62579a0fb4 (diff) | |
| download | Qt-09a123c7f9df37f82a4baab0e7ec70ebfe5444d3.zip Qt-09a123c7f9df37f82a4baab0e7ec70ebfe5444d3.tar.gz Qt-09a123c7f9df37f82a4baab0e7ec70ebfe5444d3.tar.bz2 | |
Mark both the new and original EGL contexts as sharing
If we succeed in creating a shared context, then mark the original
as shared as well.
Reviewed-by: Sarah Smith
| -rw-r--r-- | src/opengl/qgl_qws.cpp | 2 | ||||
| -rw-r--r-- | src/opengl/qgl_wince.cpp | 2 | ||||
| -rw-r--r-- | src/opengl/qgl_x11egl.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qgl/tst_qgl.cpp | 1 |
4 files changed, 7 insertions, 0 deletions
diff --git a/src/opengl/qgl_qws.cpp b/src/opengl/qgl_qws.cpp index de9c6ae..a189c20 100644 --- a/src/opengl/qgl_qws.cpp +++ b/src/opengl/qgl_qws.cpp @@ -207,6 +207,8 @@ bool QGLContext::chooseContext(const QGLContext* shareContext) return false; } d->sharing = d->eglContext->isSharing(); + if (d->sharing && shareContext) + const_cast<QGLContext *>(shareContext)->d_func()->sharing = true; #if defined(EGL_VERSION_1_1) if (d->glFormat.swapInterval() != -1 && devType == QInternal::Widget) diff --git a/src/opengl/qgl_wince.cpp b/src/opengl/qgl_wince.cpp index 86fe3ba..2553110 100644 --- a/src/opengl/qgl_wince.cpp +++ b/src/opengl/qgl_wince.cpp @@ -167,6 +167,8 @@ bool QGLContext::chooseContext(const QGLContext* shareContext) return false; } d->sharing = d->eglContext->isSharing(); + if (d->sharing && shareContext) + const_cast<QGLContext *>(shareContext)->d_func()->sharing = true; #if defined(EGL_VERSION_1_1) if (d->glFormat.swapInterval() != -1 && devType == QInternal::Widget) diff --git a/src/opengl/qgl_x11egl.cpp b/src/opengl/qgl_x11egl.cpp index 5325451..b51c239 100644 --- a/src/opengl/qgl_x11egl.cpp +++ b/src/opengl/qgl_x11egl.cpp @@ -116,6 +116,8 @@ bool QGLContext::chooseContext(const QGLContext* shareContext) return false; } d->sharing = d->eglContext->isSharing(); + if (d->sharing && shareContext) + const_cast<QGLContext *>(shareContext)->d_func()->sharing = true; #if defined(EGL_VERSION_1_1) if (d->glFormat.swapInterval() != -1 && devType == QInternal::Widget) diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/qgl/tst_qgl.cpp index 6703d4e..373cc45 100644 --- a/tests/auto/qgl/tst_qgl.cpp +++ b/tests/auto/qgl/tst_qgl.cpp @@ -1817,6 +1817,7 @@ void tst_QGL::shareRegister() delete glw1; QSKIP("Context sharing is not supported", SkipSingle); } + QVERIFY(glw1->isSharing()); QVERIFY(glw1->context() != glw2->context()); // Check that the first context's resource is also on the second. |