diff options
author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-05 15:00:41 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-12-05 16:45:27 +0100 |
commit | 8c0014213b97cf3bde80fbae63d5a46ad425673c (patch) | |
tree | 4ce055a8b6f881ffdb514027b834292f3863ad69 /src/gui/opengl | |
parent | c43133c81ea9abc10b42f1bd46c756167cad35d3 (diff) | |
parent | 7644faa881d3054e79cf886dc60080ba33dd540a (diff) |
Merge "Merge remote-tracking branch 'origin/5.4.0' into 5.4" into refs/staging/5.4
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; } |