summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Kjernåsen <trond@trolltech.com>2009-12-09 11:14:58 (GMT)
committerTrond Kjernåsen <trond@trolltech.com>2009-12-09 13:15:58 (GMT)
commitc4d66e27ea69b84bf280209fc72239132924930d (patch)
tree572693504e263b844bb4312968721eda91903985
parent6744e241ee41a50b02a76e3e755ec448676589a4 (diff)
downloadQt-c4d66e27ea69b84bf280209fc72239132924930d.zip
Qt-c4d66e27ea69b84bf280209fc72239132924930d.tar.gz
Qt-c4d66e27ea69b84bf280209fc72239132924930d.tar.bz2
GLES 2 should *not* use a multisampled format by default.
This is a platform regression and should never have been there in the first place. Having this as the default format on embedded devices may drop the framerates with as much as 30% on selected HW. Reviewed-by: Tom Cooksey
-rw-r--r--src/opengl/qgl.cpp3
-rw-r--r--src/opengl/qgl_p.h3
2 files changed, 1 insertions, 5 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 25285b5..dcf8c00 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -397,8 +397,7 @@ static inline GLint qgluProject(GLdouble objx, GLdouble objy, GLdouble objz,
\i \link setDirectRendering() Direct rendering:\endlink Enabled.
\i \link setOverlay() Overlay:\endlink Disabled.
\i \link setPlane() Plane:\endlink 0 (i.e., normal plane).
- \i \link setSampleBuffers() Multisample buffers:\endlink Enabled on
- OpenGL/ES 2.0, disabled on other platforms.
+ \i \link setSampleBuffers() Multisample buffers:\endlink Disabled.
\endlist
*/
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index 615fb60..8a0b31f 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -133,9 +133,6 @@ public:
: ref(1)
{
opts = QGL::DoubleBuffer | QGL::DepthBuffer | QGL::Rgba | QGL::DirectRendering | QGL::StencilBuffer;
-#if defined(QT_OPENGL_ES_2)
- opts |= QGL::SampleBuffers;
-#endif
pln = 0;
depthSize = accumSize = stencilSize = redSize = greenSize = blueSize = alphaSize = -1;
numSamples = -1;