From ca1812f38c468499eb7259a5b82479c038585565 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Fri, 21 May 2021 09:54:33 -0400 Subject: [PATCH] Revert "wpe: Properly respect LIBGL_ALWAYS_SOFTWARE" This causes issues I didn't see: https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2252#note_927633 Let's just tell people to use capsfilter to force software rendering in `wpesrc` for now. The intent was to allow forcing it easily in playbin2 for the CI, but we will do it some other way and see when time comes. This reverts commit 9415106b029e5469ca28d882dc46ecc38786d4c9. Part-of: --- ext/wpe/WPEThreadedView.cpp | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/ext/wpe/WPEThreadedView.cpp b/ext/wpe/WPEThreadedView.cpp index 586faf7..b4a49b4 100644 --- a/ext/wpe/WPEThreadedView.cpp +++ b/ext/wpe/WPEThreadedView.cpp @@ -381,23 +381,21 @@ WPEView::WPEView(WebKitWebContext* web_context, GstWpeVideoSrc* src, GstGLContex threading.ready = FALSE; g_mutex_init(&images_mutex); - if (g_strcmp0(g_getenv("LIBGL_ALWAYS_SOFTWARE"), "true")) { - if (context) - gst.context = GST_GL_CONTEXT(gst_object_ref(context)); - if (display) { - gst.display = GST_GL_DISPLAY(gst_object_ref(display)); - } + if (context) + gst.context = GST_GL_CONTEXT(gst_object_ref(context)); + if (display) { + gst.display = GST_GL_DISPLAY(gst_object_ref(display)); + } - wpe.width = width; - wpe.height = height; + wpe.width = width; + wpe.height = height; - if (context && display) { - if (gst_gl_context_get_gl_platform(context) == GST_GL_PLATFORM_EGL) { - gst.display_egl = gst_gl_display_egl_from_gl_display (gst.display); - } else { - GST_DEBUG ("Available GStreamer GL Context is not EGL - not creating an EGL display from it"); - } - } + if (context && display) { + if (gst_gl_context_get_gl_platform(context) == GST_GL_PLATFORM_EGL) { + gst.display_egl = gst_gl_display_egl_from_gl_display (gst.display); + } else { + GST_DEBUG ("Available GStreamer GL Context is not EGL - not creating an EGL display from it"); + } } if (gst.display_egl) { -- 2.7.4