diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-05 14:22:45 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-05 14:22:45 +0200 |
commit | f2856875843efce9a00e90dad05bde358ab82197 (patch) | |
tree | 93346c38504ce04f0bf02dfe4a21299feb1be8ed /src/gui/opengl/qopenglframebufferobject.cpp | |
parent | a7b04275082d065f392e7f18c54ea9b41507ae40 (diff) | |
parent | a2970719c26c946fd6fea7d902aad6706a4ca6ea (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
examples/corelib/ipc/ipc.pro
src/plugins/platforms/xcb/qxcbbackingstore.cpp
tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp
Change-Id: Ia006e10ff1732fe78f90138c41f05b59b49486cf
Diffstat (limited to 'src/gui/opengl/qopenglframebufferobject.cpp')
-rw-r--r-- | src/gui/opengl/qopenglframebufferobject.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/opengl/qopenglframebufferobject.cpp b/src/gui/opengl/qopenglframebufferobject.cpp index 5f5b7f46ec..597d347915 100644 --- a/src/gui/opengl/qopenglframebufferobject.cpp +++ b/src/gui/opengl/qopenglframebufferobject.cpp @@ -1287,9 +1287,13 @@ static inline QImage qt_gl_read_framebuffer_rgba8(const QSize &size, bool includ const char *renderer = reinterpret_cast<const char *>(funcs->glGetString(GL_RENDERER)); const char *ver = reinterpret_cast<const char *>(funcs->glGetString(GL_VERSION)); - // Blacklist PowerVR Rogue G6200 as it has problems with its BGRA support. + // Blacklist GPU chipsets that have problems with their BGRA support. const bool blackListed = (qstrcmp(renderer, "PowerVR Rogue G6200") == 0 - && ::strstr(ver, "1.3") != 0); + && ::strstr(ver, "1.3") != 0) || + (qstrcmp(renderer, "Mali-T760") == 0 + && ::strstr(ver, "3.1") != 0) || + (qstrcmp(renderer, "Mali-T720") == 0 + && ::strstr(ver, "3.1") != 0); const bool supports_bgra = has_bgra_ext && !blackListed; |