Avoid duplicate calls to eglGetDisplay() in XCB / Xlib platforms.

Just call eglGetDisplay() once, as we also need to call eglInitialize()
before the display can be used validly.

4 files changed, 17 insertions, 5 deletions

diff --git a/src/plugins/platforms/xlib/qxlibintegration.cpp b/src/plugins/platforms/xlib/qxlibintegration.cpp
index 6733ed1..63197b0 100644
--- a/src/plugins/platforms/xlib/qxlibintegration.cpp
+++ b/src/plugins/platforms/xlib/qxlibintegration.cpp
@@ -141,11 +141,12 @@ bool QXlibIntegration::hasOpenGL() const
     static bool wasEglInitialized = false;
     if (!eglHasbeenInitialized) {
         eglHasbeenInitialized = true;
-        const QXlibScreen *screen = static_cast<const QXlibScreen *>(mScreens.at(0));
+        QXlibScreen *screen = static_cast<QXlibScreen *>(mScreens.at(0));
         EGLint major, minor;
         eglBindAPI(EGL_OPENGL_ES_API);
         EGLDisplay disp = eglGetDisplay(screen->display()->nativeDisplay());
         wasEglInitialized = eglInitialize(disp,&major,&minor);
+        screen->setEglDisplay(disp);
     }
     return wasEglInitialized;
 #endif
diff --git a/src/plugins/platforms/xlib/qxlibscreen.cpp b/src/plugins/platforms/xlib/qxlibscreen.cpp
index 23a2d07..7c8a367 100644
--- a/src/plugins/platforms/xlib/qxlibscreen.cpp
+++ b/src/plugins/platforms/xlib/qxlibscreen.cpp
@@ -191,6 +191,9 @@ qDebug() << "qt_x_errhandler" << err->error_code;
 
 QXlibScreen::QXlibScreen()
         : mFormat(QImage::Format_RGB32)
+#if !defined(QT_NO_OPENGL) && defined(QT_OPENGL_ES_2)
+        , mEGLDisplay(0)
+#endif
 {
     char *display_name = getenv("DISPLAY");
     Display *display = XOpenDisplay(display_name);
@@ -467,7 +470,7 @@ int QXlibScreen::xScreenNumber() const
 
 Visual * QXlibScreen::defaultVisual() const
 {
-    DefaultVisual(display()->nativeDisplay(), xScreenNumber());
+    return DefaultVisual(display()->nativeDisplay(), xScreenNumber());
 }
 
 QXlibKeyboard * QXlibScreen::keyboard() const
diff --git a/src/plugins/platforms/xlib/qxlibscreen.h b/src/plugins/platforms/xlib/qxlibscreen.h
index 35c0141..8c04c0f 100644
--- a/src/plugins/platforms/xlib/qxlibscreen.h
+++ b/src/plugins/platforms/xlib/qxlibscreen.h
@@ -82,6 +82,11 @@ public:
 
     QXlibKeyboard *keyboard() const;
 
+#if !defined(QT_NO_OPENGL) && defined(QT_OPENGL_ES_2)
+    void *eglDisplay() const { return mEGLDisplay; }
+    void setEglDisplay(void *display) { mEGLDisplay = display; }
+#endif
+
 public slots:
     void eventDispatcher();
 
@@ -96,6 +101,9 @@ private:
     QXlibKeyboard *mKeyboard;
 
     QXlibDisplay * mDisplay;
+#if !defined(QT_NO_OPENGL) && defined(QT_OPENGL_ES_2)
+    void *mEGLDisplay;
+#endif
     int mScreen;
 };
 
diff --git a/src/plugins/platforms/xlib/qxlibwindow.cpp b/src/plugins/platforms/xlib/qxlibwindow.cpp
index a7bc53c..01d4b8e 100644
--- a/src/plugins/platforms/xlib/qxlibwindow.cpp
+++ b/src/plugins/platforms/xlib/qxlibwindow.cpp
@@ -87,9 +87,9 @@ QXlibWindow::QXlibWindow(QWidget *window)
 #else
         QPlatformWindowFormat windowFormat = correctColorBuffers(window->platformWindowFormat());
 
-        EGLDisplay eglDisplay = eglGetDisplay(mScreen->display()->nativeDisplay());
+        EGLDisplay eglDisplay = mScreen->eglDisplay();
         EGLConfig eglConfig = q_configFromQPlatformWindowFormat(eglDisplay,windowFormat);
-        VisualID id = QXlibEglIntegration::getCompatibleVisualId(mScreen->display()->nativeDisplay(),eglConfig);
+        VisualID id = QXlibEglIntegration::getCompatibleVisualId(mScreen->display()->nativeDisplay(), eglDisplay, eglConfig);
 
         XVisualInfo visualInfoTemplate;
         memset(&visualInfoTemplate, 0, sizeof(XVisualInfo));
@@ -663,7 +663,7 @@ QPlatformGLContext *QXlibWindow::glContext() const
 #if !defined(QT_OPENGL_ES_2)
         that->mGLContext = new QGLXContext(x_window, mScreen,widget()->platformWindowFormat());
 #else
-        EGLDisplay display = eglGetDisplay(mScreen->display()->nativeDisplay());
+        EGLDisplay display = mScreen->eglDisplay();
 
         QPlatformWindowFormat windowFormat = correctColorBuffers(widget()->platformWindowFormat());