1 From c4d66e27ea69b84bf280209fc72239132924930d Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= <trond@trolltech.com>
3 Date: Wed, 9 Dec 2009 12:14:58 +0100
4 Subject: [PATCH 1008/1244] GLES 2 should *not* use a multisampled format by default.
6 This is a platform regression and should never have been there in the
7 first place. Having this as the default format on embedded devices
8 may drop the framerates with as much as 30% on selected HW.
10 Reviewed-by: Tom Cooksey
12 src/opengl/qgl.cpp | 3 +--
13 src/opengl/qgl_p.h | 3 ---
14 2 files changed, 1 insertions(+), 5 deletions(-)
16 diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
17 index 25285b5..dcf8c00 100644
18 --- a/src/opengl/qgl.cpp
19 +++ b/src/opengl/qgl.cpp
20 @@ -397,8 +397,7 @@ static inline GLint qgluProject(GLdouble objx, GLdouble objy, GLdouble objz,
21 \i \link setDirectRendering() Direct rendering:\endlink Enabled.
22 \i \link setOverlay() Overlay:\endlink Disabled.
23 \i \link setPlane() Plane:\endlink 0 (i.e., normal plane).
24 - \i \link setSampleBuffers() Multisample buffers:\endlink Enabled on
25 - OpenGL/ES 2.0, disabled on other platforms.
26 + \i \link setSampleBuffers() Multisample buffers:\endlink Disabled.
30 diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
31 index 615fb60..8a0b31f 100644
32 --- a/src/opengl/qgl_p.h
33 +++ b/src/opengl/qgl_p.h
34 @@ -133,9 +133,6 @@ public:
37 opts = QGL::DoubleBuffer | QGL::DepthBuffer | QGL::Rgba | QGL::DirectRendering | QGL::StencilBuffer;
38 -#if defined(QT_OPENGL_ES_2)
39 - opts |= QGL::SampleBuffers;
42 depthSize = accumSize = stencilSize = redSize = greenSize = blueSize = alphaSize = -1;