diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-09 14:04:16 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-09 14:04:16 (GMT) |
| commit | 371a407618fad14beca8985e4c8c4f85add4d3e1 (patch) | |
| tree | 42742b2f7e20b033d4e04b746f5b721c8dbf46c4 /src/opengl | |
| parent | caaf77c971ea96b021bb6efe0bd1796ce8ebec6a (diff) | |
| parent | e441fa33a1068e198bf2c7bc54f54f1ff13410c9 (diff) | |
| download | Qt-371a407618fad14beca8985e4c8c4f85add4d3e1.zip Qt-371a407618fad14beca8985e4c8c4f85add4d3e1.tar.gz Qt-371a407618fad14beca8985e4c8c4f85add4d3e1.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qgl_qws.cpp | 3 | ||||
| -rw-r--r-- | src/opengl/qgl_wince.cpp | 3 | ||||
| -rw-r--r-- | src/opengl/qgl_x11egl.cpp | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/src/opengl/qgl_qws.cpp b/src/opengl/qgl_qws.cpp index 5e59975..a189c20 100644 --- a/src/opengl/qgl_qws.cpp +++ b/src/opengl/qgl_qws.cpp @@ -206,6 +206,9 @@ bool QGLContext::chooseContext(const QGLContext* shareContext) d->eglContext = 0; 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 fea2d3a..2553110 100644 --- a/src/opengl/qgl_wince.cpp +++ b/src/opengl/qgl_wince.cpp @@ -166,6 +166,9 @@ bool QGLContext::chooseContext(const QGLContext* shareContext) d->eglContext = 0; 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 9b20297..b51c239 100644 --- a/src/opengl/qgl_x11egl.cpp +++ b/src/opengl/qgl_x11egl.cpp @@ -115,6 +115,9 @@ bool QGLContext::chooseContext(const QGLContext* shareContext) d->eglContext = 0; 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) |