1 files changed, 14 insertions, 7 deletions
diff --git a/src/plugins/platforms/eglfs/qeglfscontext.cpp b/src/plugins/platforms/eglfs/qeglfscontext.cpp
index 66b42d64e7..06db4e02db 100644
--- a/src/plugins/platforms/eglfs/qeglfscontext.cpp
+++ b/src/plugins/platforms/eglfs/qeglfscontext.cpp
@@ -43,14 +43,17 @@
 #include "qeglfswindow.h"
 #include "qeglfscursor.h"
 #include "qeglfshooks.h"
+#include "qeglfsintegration.h"
 
+#include <QtPlatformSupport/private/qeglpbuffer_p.h>
+#include <QtGui/QSurface>
 #include <QtDebug>
 
 QT_BEGIN_NAMESPACE
 
 QEglFSContext::QEglFSContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share,
                              EGLDisplay display, EGLenum eglApi)
-    : QEGLPlatformContext(hooks->surfaceFormatFor(format), share, display, eglApi)
+    : QEGLPlatformContext(format, share, display, QEglFSIntegration::chooseConfig(display, format), eglApi)
 {
 }
 
@@ -61,16 +64,20 @@ bool QEglFSContext::makeCurrent(QPlatformSurface *surface)
 
 EGLSurface QEglFSContext::eglSurfaceForPlatformSurface(QPlatformSurface *surface)
 {
-    QEglFSWindow *window = static_cast<QEglFSWindow *>(surface);
-    return window->surface();
+    if (surface->surface()->surfaceClass() == QSurface::Window)
+        return static_cast<QEglFSWindow *>(surface)->surface();
+    else
+        return static_cast<QEGLPbuffer *>(surface)->pbuffer();
 }
 
 void QEglFSContext::swapBuffers(QPlatformSurface *surface)
 {
-    QEglFSWindow *window = static_cast<QEglFSWindow *>(surface);
-    // draw the cursor
-    if (QEglFSCursor *cursor = static_cast<QEglFSCursor *>(window->screen()->cursor()))
-        cursor->paintOnScreen();
+    if (surface->surface()->surfaceClass() == QSurface::Window) {
+        QEglFSWindow *window = static_cast<QEglFSWindow *>(surface);
+        // draw the cursor
+        if (QEglFSCursor *cursor = static_cast<QEglFSCursor *>(window->screen()->cursor()))
+            cursor->paintOnScreen();
+    }
 
     QEGLPlatformContext::swapBuffers(surface);
 }