From 82340ea5cd148253eb07877468bf3c8873f90e56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Tue, 17 Jan 2012 09:05:38 +0100 Subject: 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 (cherry picked from commit f13d0078d9f829cde2cd5b8b9eac40635a883ec6) --- src/opengl/qglextensions.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/opengl/qglextensions.cpp') diff --git a/src/opengl/qglextensions.cpp b/src/opengl/qglextensions.cpp index 34196b6181..6cf0879d64 100644 --- a/src/opengl/qglextensions.cpp +++ b/src/opengl/qglextensions.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qgl_p.h" +#include QT_BEGIN_NAMESPACE @@ -397,9 +398,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; -- cgit v1.2.3