summaryrefslogtreecommitdiffstats
path: root/src/gui/egl/qeglproperties.cpp
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@nokia.com>2010-01-14 12:35:08 (GMT)
committerPaul Olav Tvete <paul.tvete@nokia.com>2010-01-14 12:35:08 (GMT)
commitd88a7e7a76deaa0c0e36d94a001d6f64834e22c2 (patch)
tree80b604a84c06efaa36ddf5e6eb324caf8aea66b0 /src/gui/egl/qeglproperties.cpp
parent645f29c727f33cc9f8b00b8efcb658a050ac6a26 (diff)
parentf17aeadf56818e5f20e20eb91450e66adb88c99b (diff)
downloadQt-d88a7e7a76deaa0c0e36d94a001d6f64834e22c2.zip
Qt-d88a7e7a76deaa0c0e36d94a001d6f64834e22c2.tar.gz
Qt-d88a7e7a76deaa0c0e36d94a001d6f64834e22c2.tar.bz2
Merge remote branch 'origin/4.6' into lighthouse
Conflicts: configure src/corelib/global/qglobal.cpp src/gui/dialogs/dialogs.pri
Diffstat (limited to 'src/gui/egl/qeglproperties.cpp')
-rw-r--r--src/gui/egl/qeglproperties.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/gui/egl/qeglproperties.cpp b/src/gui/egl/qeglproperties.cpp
index 2d37edb..2915fb9 100644
--- a/src/gui/egl/qeglproperties.cpp
+++ b/src/gui/egl/qeglproperties.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
@@ -229,6 +229,15 @@ void QEglProperties::setRenderableType(QEgl::API api)
// reductions in complexity are possible.
bool QEglProperties::reduceConfiguration()
{
+ // EGL chooses configs with the highest color depth over
+ // those with smaller (but faster) lower color depths. One
+ // way around this is to set EGL_BUFFER_SIZE to 16, which
+ // trumps the others. Of course, there may not be a 16-bit
+ // config avaliable, so it's the first restraint we remove.
+ if (value(EGL_BUFFER_SIZE) == 16) {
+ removeValue(EGL_BUFFER_SIZE);
+ return true;
+ }
if (removeValue(EGL_SAMPLE_BUFFERS)) {
removeValue(EGL_SAMPLES);
return true;