diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-07-26 10:13:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-07-26 13:29:27 +0200 |
| commit | 28af6e97e5fe7f844bc85df7af22ce8b7414f5a6 (patch) | |
| tree | ed83933e4f6a9d40c546c85aa136f18ce927dfc8 /src/gui/opengl/qopenglshaderprogram.cpp | |
| parent | 547f216efdef3667b0b23ecddce93e5184806800 (diff) | |
| parent | bf08e0bbb28917f1965cd29ed449e553d1d1f4f1 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'src/gui/opengl/qopenglshaderprogram.cpp')
| -rw-r--r-- | src/gui/opengl/qopenglshaderprogram.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/gui/opengl/qopenglshaderprogram.cpp b/src/gui/opengl/qopenglshaderprogram.cpp index f225d5dc756..3c7bd4f90d3 100644 --- a/src/gui/opengl/qopenglshaderprogram.cpp +++ b/src/gui/opengl/qopenglshaderprogram.cpp @@ -3755,8 +3755,14 @@ QOpenGLProgramBinarySupportCheck::QOpenGLProgramBinarySupportCheck(QOpenGLContex if (ctx) { if (ctx->isOpenGLES()) { qCDebug(DBG_SHADER_CACHE, "OpenGL ES v%d context", ctx->format().majorVersion()); - if (ctx->format().majorVersion() >= 3) + if (ctx->format().majorVersion() >= 3) { m_supported = true; + } else { + const bool hasExt = ctx->hasExtension("GL_OES_get_program_binary"); + qCDebug(DBG_SHADER_CACHE, "GL_OES_get_program_binary support = %d", hasExt); + if (hasExt) + m_supported = true; + } } else { const bool hasExt = ctx->hasExtension("GL_ARB_get_program_binary"); qCDebug(DBG_SHADER_CACHE, "GL_ARB_get_program_binary support = %d", hasExt); |