diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-19 10:46:15 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-07-19 10:46:15 +0000 |
| commit | b3f260236a5f5bcf2db0692e90bb2a875b9da078 (patch) | |
| tree | f1cc4378e829cc4521621329764914adb60439da /src/gui/opengl/qopenglframebufferobject.cpp | |
| parent | 267c01390544ba12f81783c8b0e37ed38db231d6 (diff) | |
| parent | 82ea53ad24c92b345ac2b542a174887f5de5723a (diff) | |
| download | qtbase-b3f260236a5f5bcf2db0692e90bb2a875b9da078.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/gui/opengl/qopenglframebufferobject.cpp')
| -rw-r--r-- | src/gui/opengl/qopenglframebufferobject.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/opengl/qopenglframebufferobject.cpp b/src/gui/opengl/qopenglframebufferobject.cpp index c5818e9373..0eee0c9879 100644 --- a/src/gui/opengl/qopenglframebufferobject.cpp +++ b/src/gui/opengl/qopenglframebufferobject.cpp @@ -1289,6 +1289,7 @@ static inline QImage qt_gl_read_framebuffer_rgba8(const QSize &size, bool includ const char *ver = reinterpret_cast<const char *>(funcs->glGetString(GL_VERSION)); // Blacklist GPU chipsets that have problems with their BGRA support. +#ifndef Q_OS_IOS const bool blackListed = (qstrcmp(renderer, "PowerVR Rogue G6200") == 0 && ::strstr(ver, "1.3") != 0) || (qstrcmp(renderer, "Mali-T760") == 0 @@ -1296,7 +1297,9 @@ static inline QImage qt_gl_read_framebuffer_rgba8(const QSize &size, bool includ (qstrcmp(renderer, "Mali-T720") == 0 && ::strstr(ver, "3.1") != 0) || qstrcmp(renderer, "PowerVR SGX 554") == 0; - +#else + const bool blackListed = true; +#endif const bool supports_bgra = has_bgra_ext && !blackListed; if (supports_bgra) { |