From 33c60bdbf9ae2fd2e88099ad89ad836b8b78c2f5 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Sat, 22 May 2021 15:42:17 +1000 Subject: [PATCH] gl/display: remove choosing egl fallback from GST_GL_PLATFORM If GST_GL_WINDOW is unset but GST_GL_PLATFORM=egl, then we were choosing to create an GstGLDisplayEGL directly instead of going through the any more specific windowing system implementation (X11, Wayland). The 'create an GstGLDisplayEGL when GST_GL_PLATFORM=egl' was a fallback as we did not have entries for all EGL-using window systems previously. Now that we do, the fallback can be removed. An EGLDisplay can still be created by setting GST_GL_WINDOW=egl or as one option. Fixup of https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1154 Part-of: --- gst-libs/gst/gl/gstgldisplay.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c index effaaa3a0f..9af985d4e9 100644 --- a/gst-libs/gst/gl/gstgldisplay.c +++ b/gst-libs/gst/gl/gstgldisplay.c @@ -316,14 +316,12 @@ gst_gl_display_type_from_environment (void) return GST_GL_DISPLAY_TYPE_EGL; } else if (g_strstr_len (env, 4, "winrt")) { return GST_GL_DISPLAY_TYPE_EGL; + } else { + return GST_GL_DISPLAY_TYPE_NONE; } } - if (platform && g_strstr_len (platform, 3, "egl")) { - return GST_GL_DISPLAY_TYPE_EGL; - } - - return GST_GL_DISPLAY_TYPE_NONE; + return GST_GL_DISPLAY_TYPE_ANY; } static GstGLDisplay *