diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-27 09:54:43 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-27 09:56:20 +0200 |
| commit | 6b58ce5251045fb751eb511b2cb3571bcd113f28 (patch) | |
| tree | 7d3b63836c7ec0cce618ce4180c9f5ed63900a6a /src/quick/scenegraph/qsgdefaultglyphnode_p.cpp | |
| parent | 93d7c26653757755ae65f14d06d6df6f9ec2fc07 (diff) | |
| parent | c849f3a7eff55d60c4010831ec67336c5c0f2a27 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/quick/items/qquickwindow.cpp
tests/auto/quick/qquicktext/BLACKLIST
tests/auto/quick/qquicktextedit/BLACKLIST
Change-Id: I8bd68b0b5e853b7908791d2cbddd18dd527c76ae
Diffstat (limited to 'src/quick/scenegraph/qsgdefaultglyphnode_p.cpp')
| -rw-r--r-- | src/quick/scenegraph/qsgdefaultglyphnode_p.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp index d6128b339c..161373306a 100644 --- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp +++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp @@ -239,7 +239,8 @@ bool QSG24BitTextMaskShader::useSRGB() const // m_useSRGB is true, but if some QOGLFBO was bound check it's texture format: QOpenGLContext *ctx = QOpenGLContext::currentContext(); QOpenGLFramebufferObject *qfbo = QOpenGLContextPrivate::get(ctx)->qgl_current_fbo; - return !qfbo || qfbo->format().internalTextureFormat() == GL_SRGB8_ALPHA8_EXT; + bool fboInvalid = QOpenGLContextPrivate::get(ctx)->qgl_current_fbo_invalid; + return !qfbo || fboInvalid || qfbo->format().internalTextureFormat() == GL_SRGB8_ALPHA8_EXT; #else return m_useSRGB; #endif |