commit ea53d9fedc322355842bc3e34a998cbf5e8b8ac6
author Carlos Rafael Giani <dv@pseudoterminal.org> Sun Mar 04 15:14:08 2018 +0100
committer Tim-Philipp Müller <tim@centricular.com> Wed Mar 28 12:28:10 2018 +0100
tree 6710c88a6940b272ef6b0db12cb30c358c94744d
parent 6ab0442f90520c6cc1c076b0a0d22af534b274ec

qt: Get EGL native display from QPA if platform header is available

https://bugzilla.gnome.org/show_bug.cgi?id=792378

configure.ac

diff --git a/configure.ac b/configure.ac
index 17717f0..3d0efea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -892,6 +892,7 @@
         AS_IF([test -f "$PKG_CONFIG_SYSROOT_DIR/$QPA_INCLUDE_PATH/qpa/qplatformnativeinterface.h"], [
           QT_CFLAGS="$QT_CFLAGS -I$PKG_CONFIG_SYSROOT_DIR/$QPA_INCLUDE_PATH"
           HAVE_QT_QPA_HEADER="yes"
+          AC_DEFINE([HAVE_QT_QPA_HEADER], [], [Define if the Qt QPA header is installed])
         ], [AC_MSG_NOTICE([Cannot find QPA])])
         if test "x$GST_GL_HAVE_WINDOW_X11" = "x1" -a "x$GST_GL_HAVE_PLATFORM_GLX" = "x1" || test "x$GST_GL_HAVE_WINDOW_X11" = "x1" -a "x$GST_GL_HAVE_PLATFORM_EGL" = "x1"; then
           PKG_CHECK_MODULES(QT_X11, Qt5X11Extras, [

ext/qt/gstqtglutility.cc

diff --git a/ext/qt/gstqtglutility.cc b/ext/qt/gstqtglutility.cc
index ee9d04b..cc84c83 100644
--- a/ext/qt/gstqtglutility.cc
+++ b/ext/qt/gstqtglutility.cc
@@ -42,6 +42,9 @@
 #else
 #include <gst/gl/egl/gstegl.h>
 #include <gst/gl/egl/gstgldisplay_egl.h>
+#ifdef HAVE_QT_QPA_HEADER
+#include <qpa/qplatformnativeinterface.h>
+#endif
 #endif
 #endif
 
@@ -110,6 +113,13 @@
     }
 
     display = (GstGLDisplay *) gst_gl_display_viv_fb_new (disp_idx);
+#elif defined(HAVE_QT_QPA_HEADER)
+    QPlatformNativeInterface *native =
+        QGuiApplication::platformNativeInterface();
+    EGLDisplay egl_display = (EGLDisplay)
+        native->nativeResourceForWindow("egldisplay", NULL);
+    if (egl_display != EGL_NO_DISPLAY)
+      display = (GstGLDisplay *) gst_gl_display_egl_new_with_egl_display (egl_display);
 #else
     EGLDisplay egl_display = (EGLDisplay) gst_gl_display_egl_get_from_native (GST_GL_DISPLAY_TYPE_ANY, 0);
     display = (GstGLDisplay *) gst_gl_display_egl_new_with_egl_display (egl_display);