summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Dominic K <mdk@codethink.co.uk>2010-07-07 07:20:00 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2011-04-01 07:59:03 (GMT)
commit19d730890eba9da7bdccc2fbc8407bffd622311e (patch)
treed0ef3e39f34d8157403133f3308c8b4580770bac
parent9009e0e1138b684b7013903551a37c9ac1ebdd4c (diff)
downloadQt-19d730890eba9da7bdccc2fbc8407bffd622311e.zip
Qt-19d730890eba9da7bdccc2fbc8407bffd622311e.tar.gz
Qt-19d730890eba9da7bdccc2fbc8407bffd622311e.tar.bz2
Actually do use the properties parameter in ::createSurface for x11egl.
-rw-r--r--src/gui/egl/qegl_x11.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/gui/egl/qegl_x11.cpp b/src/gui/egl/qegl_x11.cpp
index fb9ee9d..bf79ec7 100644
--- a/src/gui/egl/qegl_x11.cpp
+++ b/src/gui/egl/qegl_x11.cpp
@@ -330,10 +330,8 @@ void qt_set_winid_on_widget(QWidget* w, Qt::HANDLE id)
// NOTE: The X11 version of createSurface will re-create the native drawable if it's visual doesn't
// match the one for the passed in EGLConfig
-EGLSurface QEgl::createSurface(QPaintDevice *device, EGLConfig config, const QEglProperties *unusedProperties)
+EGLSurface QEgl::createSurface(QPaintDevice *device, EGLConfig config, const QEglProperties *properties)
{
- Q_UNUSED(unusedProperties);
-
int devType = device->devType();
if (devType == QInternal::Pbuffer) {
@@ -417,7 +415,12 @@ EGLSurface QEgl::createSurface(QPaintDevice *device, EGLConfig config, const QEg
// At this point, the widget's window should be created and have the correct visual. Now we
// just need to create the EGL surface for it:
- EGLSurface surf = eglCreateWindowSurface(QEgl::display(), config, (EGLNativeWindowType)widget->winId(), 0);
+ const int *props;
+ if (properties)
+ props = properties->properties();
+ else
+ props = 0;
+ EGLSurface surf = eglCreateWindowSurface(QEgl::display(), config, (EGLNativeWindowType)widget->winId(), props);
if (surf == EGL_NO_SURFACE)
qWarning("QEglContext::createSurface(): Unable to create EGL surface, error = 0x%x", eglGetError());
return surf;