From c9dd45393ea63f5ba0bf0a6e4dd38ef1f5d7fc18 Mon Sep 17 00:00:00 2001 From: Sergey Borovkov Date: Thu, 14 Apr 2016 18:14:32 +0300 Subject: [PATCH] qml: Enable qmlglsink for eglfs https://bugzilla.gnome.org/show_bug.cgi?id=763044 --- ext/qt/qtitem.cc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ext/qt/qtitem.cc b/ext/qt/qtitem.cc index 9c359f8..505ed03 100644 --- a/ext/qt/qtitem.cc +++ b/ext/qt/qtitem.cc @@ -44,7 +44,7 @@ #include #endif -#if GST_GL_HAVE_WINDOW_ANDROID && GST_GL_HAVE_PLATFORM_EGL && defined (HAVE_QT_ANDROID) +#if GST_GL_HAVE_PLATFORM_EGL && defined (HAVE_QT_EGLFS) #include #include #endif @@ -162,10 +162,14 @@ QtGLVideoItem::QtGLVideoItem() gst_gl_display_wayland_new_with_display (wayland_display); } #endif -#if GST_GL_HAVE_WINDOW_ANDROID && GST_GL_HAVE_PLATFORM_EGL && defined (HAVE_QT_ANDROID) +#if GST_GL_HAVE_PLATFORM_EGL && GST_GL_HAVE_WINDOW_ANDROID if (QString::fromUtf8 ("android") == app->platformName()) this->priv->display = (GstGLDisplay *) gst_gl_display_egl_new (); +#elif GST_GL_HAVE_PLATFORM_EGL && defined (HAVE_QT_EGLFS) + if (QString::fromUtf8("eglfs") == app->platformName()) + this->priv->display = (GstGLDisplay *) gst_gl_display_egl_new (); #endif + #if GST_GL_HAVE_WINDOW_COCOA && GST_GL_HAVE_PLATFORM_COCOA && defined (HAVE_QT_MAC) if (QString::fromUtf8 ("cocoa") == app->platformName()) this->priv->display = (GstGLDisplay *) gst_gl_display_cocoa_new (); @@ -348,7 +352,8 @@ QtGLVideoItem::onSceneGraphInitialized () platform, gl_api); } #endif -#if GST_GL_HAVE_WINDOW_ANDROID && GST_GL_HAVE_PLATFORM_EGL && defined (HAVE_QT_ANDROID) + +#if GST_GL_HAVE_PLATFORM_EGL && defined (HAVE_QT_EGLFS) if (GST_IS_GL_DISPLAY_EGL (this->priv->display)) { platform = GST_GL_PLATFORM_EGL; gl_api = gst_gl_context_get_current_gl_api (platform, NULL, NULL); @@ -359,6 +364,7 @@ QtGLVideoItem::onSceneGraphInitialized () platform, gl_api); } #endif + #if GST_GL_HAVE_WINDOW_COCOA && GST_GL_HAVE_PLATFORM_COCOA && defined (HAVE_QT_MAC) if (this->priv->display) { platform = GST_GL_PLATFORM_CGL; -- 2.7.4