diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-11-19 14:24:32 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-11-19 14:24:32 (GMT) |
| commit | c5a085cb82a9b8e91e37575e19014b60dd2e4216 (patch) | |
| tree | 5da7d764ed36126799146b21a83ea5fa095cc5ba | |
| parent | e50e811461b54e07184af547f62aa44b3c5bb681 (diff) | |
| parent | 587728bf81e60de63a80b10ae2d57b7bc18bec4e (diff) | |
| download | Qt-c5a085cb82a9b8e91e37575e19014b60dd2e4216.zip Qt-c5a085cb82a9b8e91e37575e19014b60dd2e4216.tar.gz Qt-c5a085cb82a9b8e91e37575e19014b60dd2e4216.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-lighthouse
| -rw-r--r-- | src/opengl/qgl_qpa.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/opengl/qgl_qpa.cpp b/src/opengl/qgl_qpa.cpp index 49c0860..4b530de 100644 --- a/src/opengl/qgl_qpa.cpp +++ b/src/opengl/qgl_qpa.cpp @@ -166,6 +166,15 @@ void QGLContext::makeCurrent() Q_D(QGLContext); d->platformContext->makeCurrent(); QGLContextPrivate::setCurrentContext(this); + + if (!d->workaroundsCached) { + d->workaroundsCached = true; + const char *renderer = reinterpret_cast<const char *>(glGetString(GL_RENDERER)); + if (renderer && strstr(renderer, "Mali")) { + d->workaround_brokenFBOReadBack = true; + } + } + } void QGLContext::doneCurrent() |