diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-05 11:53:33 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-05 11:53:33 +0100 |
| commit | 7644faa881d3054e79cf886dc60080ba33dd540a (patch) | |
| tree | 37610e42031ffd3bbb6522d7c6bd9070684b8d17 /src/gui/opengl | |
| parent | e682ea6f782d3bb4caa4f2bd0e3be47cbe064f4f (diff) | |
| parent | 5367fa356233da4c0f28172a8f817791525f5457 (diff) | |
Merge remote-tracking branch 'origin/5.4.0' into 5.4
Change-Id: I0cd11cbe95693b78450ea81a0187760f4a6a8b5f
Diffstat (limited to 'src/gui/opengl')
| -rw-r--r-- | src/gui/opengl/qopenglframebufferobject.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/opengl/qopenglframebufferobject.cpp b/src/gui/opengl/qopenglframebufferobject.cpp index 124d9d53f6..6351b8a1e3 100644 --- a/src/gui/opengl/qopenglframebufferobject.cpp +++ b/src/gui/opengl/qopenglframebufferobject.cpp @@ -481,11 +481,9 @@ void QOpenGLFramebufferObjectPrivate::init(QOpenGLFramebufferObject *, const QSi GLenum storageFormat = internal_format; // ES requires a sized format. The older desktop extension does not. Correct the format on ES. if (ctx->isOpenGLES() && internal_format == GL_RGBA) { -#ifdef GL_RGBA8_OES if (funcs.hasOpenGLExtension(QOpenGLExtensions::Sized8Formats)) - storageFormat = GL_RGBA8_OES; + storageFormat = GL_RGBA8; else -#endif storageFormat = GL_RGBA4; } |