From 5178fcdfda3f982c3dbe92c8a6b0cf92166f5892 Mon Sep 17 00:00:00 2001 From: Haihua Hu Date: Wed, 17 May 2017 10:58:05 +0800 Subject: [PATCH] qml: Add EGL platform support for x11 backend Add support for EGL platform when x11 is available. This can work e.g. on imx6 platform. https://bugzilla.gnome.org/show_bug.cgi?id=782718 --- ext/qt/gstqtglutility.cc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ext/qt/gstqtglutility.cc b/ext/qt/gstqtglutility.cc index 22aae60..0867f35 100644 --- a/ext/qt/gstqtglutility.cc +++ b/ext/qt/gstqtglutility.cc @@ -25,10 +25,14 @@ #include "gstqtglutility.h" #include -#if GST_GL_HAVE_WINDOW_X11 && GST_GL_HAVE_PLATFORM_GLX && defined (HAVE_QT_X11) +#if GST_GL_HAVE_WINDOW_X11 && defined (HAVE_QT_X11) #include #include +#if GST_GL_HAVE_PLATFORM_GLX #include +#elif GST_GL_HAVE_PLATFORM_EGL +#include +#endif #endif #if GST_GL_HAVE_WINDOW_WAYLAND && GST_GL_HAVE_PLATFORM_EGL && defined (HAVE_QT_WAYLAND) @@ -151,7 +155,11 @@ gst_qt_get_gl_wrapcontext (GstGLDisplay * display, #if GST_GL_HAVE_WINDOW_X11 && defined (HAVE_QT_X11) if (GST_IS_GL_DISPLAY_X11 (display)) { +#if GST_GL_HAVE_PLATFORM_GLX platform = GST_GL_PLATFORM_GLX; +#elif GST_GL_HAVE_PLATFORM_EGL + platform = GST_GL_PLATFORM_EGL; +#endif } #endif #if GST_GL_HAVE_WINDOW_WAYLAND && defined (HAVE_QT_WAYLAND) -- 2.7.4