mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "wpe: Properly respect LIBGL_ALWAYS_SOFTWARE"

Browse source 
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 9415106b02.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2273>
This commit is contained in:
Thibault Saunier 2021-05-21 09:54:33 -04:00
parent a6ebda3907
commit ca1812f38c
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
ext/wpe/WPEThreadedView.cpp
View file

@ -381,23 +381,21 @@ WPEView::WPEView(WebKitWebContext* web_context, GstWpeVideoSrc* src, GstGLContex
threading.ready = FALSE; threading.ready = FALSE;
g_mutex_init(&images_mutex); g_mutex_init(&images_mutex);
if (g_strcmp0(g_getenv("LIBGL_ALWAYS_SOFTWARE"), "true")) { if (context)
if (context) gst.context = GST_GL_CONTEXT(gst_object_ref(context));
gst.context = GST_GL_CONTEXT(gst_object_ref(context)); if (display) {
if (display) { gst.display = GST_GL_DISPLAY(gst_object_ref(display));
gst.display = GST_GL_DISPLAY(gst_object_ref(display)); }
}
wpe.width = width; wpe.width = width;
wpe.height = height; wpe.height = height;
if (context && display) { if (context && display) {
if (gst_gl_context_get_gl_platform(context) == GST_GL_PLATFORM_EGL) { if (gst_gl_context_get_gl_platform(context) == GST_GL_PLATFORM_EGL) {
gst.display_egl = gst_gl_display_egl_from_gl_display (gst.display); gst.display_egl = gst_gl_display_egl_from_gl_display (gst.display);
} else { } else {
GST_DEBUG ("Available GStreamer GL Context is not EGL - not creating an EGL display from it"); GST_DEBUG ("Available GStreamer GL Context is not EGL - not creating an EGL display from it");
} }
}
} }
if (gst.display_egl) { if (gst.display_egl) {