diff options
| author | Edward Welbourne <[email protected]> | 2016-07-15 21:08:50 +0200 |
|---|---|---|
| committer | Edward Welbourne <[email protected]> | 2016-07-15 21:08:50 +0200 |
| commit | f23ad9d576267676066da7f6c2c9b1743de9fae4 (patch) | |
| tree | 03147f35bc21f07d818feddfa8f25159b6c40c5b /src/quick/scenegraph/util/qsgatlastexture.cpp | |
| parent | d7ebaa1611758a9677809d77e0b11f501c103f8d (diff) | |
| parent | 20b96e21090fd008cc4a0d39300402fa3865d705 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
examples/quick/demos/photoviewer/deployment.pri
One side made it redundant; the other removed part of it; remove it all !
src/quick/scenegraph/util/qsgatlastexture.cpp
One side changed a preprocessor condition, the other a code condition,
on adjacent lines; keep both changes.
tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
One side changed a condition, the other the content of its block; keep both.
Change-Id: Idb8937f92a7edb28212449dfe0c5cfdb8e6de986
Diffstat (limited to 'src/quick/scenegraph/util/qsgatlastexture.cpp')
| -rw-r--r-- | src/quick/scenegraph/util/qsgatlastexture.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/scenegraph/util/qsgatlastexture.cpp b/src/quick/scenegraph/util/qsgatlastexture.cpp index a93e7bbd30..27806c48ae 100644 --- a/src/quick/scenegraph/util/qsgatlastexture.cpp +++ b/src/quick/scenegraph/util/qsgatlastexture.cpp @@ -157,13 +157,13 @@ Atlas::Atlas(const QSize &size) wrongfullyReportsBgra8888Support = false; const char *ext = (const char *) QOpenGLContext::currentContext()->functions()->glGetString(GL_EXTENSIONS); - if (!wrongfullyReportsBgra8888Support + if (ext && !wrongfullyReportsBgra8888Support && (strstr(ext, "GL_EXT_bgra") || strstr(ext, "GL_EXT_texture_format_BGRA8888") || strstr(ext, "GL_IMG_texture_format_BGRA8888"))) { m_internalFormat = m_externalFormat = GL_BGRA; #if defined(Q_OS_DARWIN) && !defined(Q_OS_OSX) - } else if (strstr(ext, "GL_APPLE_texture_format_BGRA8888")) { + } else if (ext && strstr(ext, "GL_APPLE_texture_format_BGRA8888")) { m_internalFormat = GL_RGBA; m_externalFormat = GL_BGRA; #endif // IOS || TVOS |