diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-18 16:23:01 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-18 16:23:01 (GMT) |
commit | dce762752b64be82c9592b4bed69101f4e7c9be2 (patch) | |
tree | 78c26b6942afd5928bc33a238dac76afe2bc9982 /src/gui/egl/qeglproperties.cpp | |
parent | 0cea0e45523283d6c31998672f97b0343c1388f2 (diff) | |
parent | d484656fcf0ba5422489628c9e2e89aade81e869 (diff) | |
download | Qt-dce762752b64be82c9592b4bed69101f4e7c9be2.zip Qt-dce762752b64be82c9592b4bed69101f4e7c9be2.tar.gz Qt-dce762752b64be82c9592b4bed69101f4e7c9be2.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Some QWindowSurface implementations might implement flush as a buffer
Set EGL_SWAP_BEHAVIOR to EGL_BUFFER_PRESERVED for regular QWidgets
Cleanup & remove unused function overloads from QEgl* APIs
QScrollArea: Excessive scrolling in focusNextPrevChild()
Diffstat (limited to 'src/gui/egl/qeglproperties.cpp')
-rw-r--r-- | src/gui/egl/qeglproperties.cpp | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/gui/egl/qeglproperties.cpp b/src/gui/egl/qeglproperties.cpp index b34d2c3..3638de5 100644 --- a/src/gui/egl/qeglproperties.cpp +++ b/src/gui/egl/qeglproperties.cpp @@ -241,6 +241,9 @@ void QEglProperties::setRenderableType(QEgl::API api) // reductions in complexity are possible. bool QEglProperties::reduceConfiguration() { + if (value(EGL_SWAP_BEHAVIOR) != EGL_DONT_CARE) + removeValue(EGL_SWAP_BEHAVIOR); + #ifdef EGL_VG_ALPHA_FORMAT_PRE_BIT // For OpenVG, we sometimes try to create a surface using a pre-multiplied format. If we can't // find a config which supports pre-multiplied formats, remove the flag on the surface type: @@ -292,20 +295,6 @@ static void addTag(QString& str, const QString& tag) str += tag; } -void QEglProperties::dumpAllConfigs() -{ - EGLint count = 0; - eglGetConfigs(QEgl::display(), 0, 0, &count); - if (count < 1) - return; - - EGLConfig *configs = new EGLConfig [count]; - eglGetConfigs(QEgl::display(), configs, count, &count); - for (EGLint index = 0; index < count; ++index) - qWarning() << QEglProperties(configs[index]).toString(); - delete [] configs; -} - // Convert a property list to a string suitable for debug output. QString QEglProperties::toString() const { |