diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-07 11:19:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-07 11:19:56 (GMT) |
| commit | 8082a800a55875fd2e64cf2ab5c6fa2c26722132 (patch) | |
| tree | 001f6a85a885cac42bd0188007c3114fd722f850 /src/openvg | |
| parent | 62a2fe9092d3b6038a08f5c5a7faa4a863b84fdc (diff) | |
| parent | 83567e2dd93ad46cff2b3b611e298148e7d60f62 (diff) | |
| download | Qt-8082a800a55875fd2e64cf2ab5c6fa2c26722132.zip Qt-8082a800a55875fd2e64cf2ab5c6fa2c26722132.tar.gz Qt-8082a800a55875fd2e64cf2ab5c6fa2c26722132.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Minor OpenVG optimization when setting the EGL surface attribute.
Make sure the QS60PaintEngine can draw other classes of pixmap data
Diffstat (limited to 'src/openvg')
| -rw-r--r-- | src/openvg/qwindowsurface_vgegl.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/openvg/qwindowsurface_vgegl.cpp b/src/openvg/qwindowsurface_vgegl.cpp index e3f52f4e..37e5f40 100644 --- a/src/openvg/qwindowsurface_vgegl.cpp +++ b/src/openvg/qwindowsurface_vgegl.cpp @@ -709,10 +709,9 @@ QEglContext *QVGEGLWindowSurfaceDirect::ensureContext(QWidget *widget) #if !defined(QVG_NO_PRESERVED_SWAP) // Try to force the surface back buffer to preserve its contents. if (needToSwap) { - eglGetError(); // Clear error state first. - eglSurfaceAttrib(QEgl::display(), windowSurface, + bool succeeded = eglSurfaceAttrib(QEgl::display(), windowSurface, EGL_SWAP_BEHAVIOR, EGL_BUFFER_PRESERVED); - if (eglGetError() != EGL_SUCCESS) { + if (!succeeded && eglGetError() != EGL_SUCCESS) { qWarning("QVG: could not enable preserved swap"); } } |