diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2012-01-16 12:32:30 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-16 14:35:41 (GMT) |
| commit | f13d0078d9f829cde2cd5b8b9eac40635a883ec6 (patch) | |
| tree | 604fea39adcc3722443559934590c8d2bebdb38c /src/opengl/qglextensions.cpp | |
| parent | b1916b524b0d076dfc9fad2656d65493067b1b84 (diff) | |
| download | Qt-f13d0078d9f829cde2cd5b8b9eac40635a883ec6.zip Qt-f13d0078d9f829cde2cd5b8b9eac40635a883ec6.tar.gz Qt-f13d0078d9f829cde2cd5b8b9eac40635a883ec6.tar.bz2 | |
Fixed crash in GL 2 paint engine on Intel Atom.
The GPU in question supports GL 2 but not framebuffer objects. Since we
anyway have a font rendering path that doesn't use FBOs we might as well
not require framebuffer objects in order to use the GL 2 engine.
Task-number: QTBUG-22483
Change-Id: I2a80343fedda276e73e603ffe54edff58801af5b
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Diffstat (limited to 'src/opengl/qglextensions.cpp')
| -rw-r--r-- | src/opengl/qglextensions.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/opengl/qglextensions.cpp b/src/opengl/qglextensions.cpp index c955728..60f7055 100644 --- a/src/opengl/qglextensions.cpp +++ b/src/opengl/qglextensions.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qgl_p.h" +#include <qglframebufferobject.h> QT_BEGIN_NAMESPACE @@ -418,9 +419,6 @@ bool qt_resolve_version_2_0_functions(QGLContext *ctx) if (!qt_resolve_version_1_3_functions(ctx)) gl2supported = false; - if (!qt_resolve_framebufferobject_extensions(ctx)) - gl2supported = false; - if (glStencilOpSeparate) return gl2supported; |