diff options
| author | Matthew Waters <matthew@centricular.com> | 2018-02-21 11:35:33 +1100 |
|---|---|---|
| committer | Matthew Waters <matthew@centricular.com> | 2018-02-21 11:35:33 +1100 |
| commit | ff7d14a38413d66cde3b3ac1ec65ebe6e4e54c78 (patch) | |
| tree | 2406db424b126725dd0f7bee9ce06d1cd7c55249 | |
| parent | a65a7ec05b9a3b2a5182f89675ac82c5d077fccf (diff) | |
qt: don't use libEGL functions when we don't link to libEGL
Use the provided wrapper available from libgstgl.
https://bugzilla.gnome.org/show_bug.cgi?id=793547
| -rw-r--r-- | ext/qt/gstqtglutility.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ext/qt/gstqtglutility.cc b/ext/qt/gstqtglutility.cc index 8d5b24283..ee9d04b8f 100644 --- a/ext/qt/gstqtglutility.cc +++ b/ext/qt/gstqtglutility.cc @@ -82,8 +82,10 @@ gst_qt_get_gl_display () } #endif #if GST_GL_HAVE_PLATFORM_EGL && GST_GL_HAVE_WINDOW_ANDROID - if (QString::fromUtf8 ("android") == app->platformName()) - display = (GstGLDisplay *) gst_gl_display_egl_new_with_egl_display (eglGetDisplay(EGL_DEFAULT_DISPLAY)); + if (QString::fromUtf8 ("android") == app->platformName()) { + 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); + } #elif GST_GL_HAVE_PLATFORM_EGL && defined (HAVE_QT_EGLFS) if (QString::fromUtf8("eglfs") == app->platformName()) { #if GST_GL_HAVE_WINDOW_VIV_FB @@ -109,7 +111,8 @@ gst_qt_get_gl_display () display = (GstGLDisplay *) gst_gl_display_viv_fb_new (disp_idx); #else - display = (GstGLDisplay *) gst_gl_display_egl_new_with_egl_display (eglGetDisplay(EGL_DEFAULT_DISPLAY)); + 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); #endif } #endif |