Build fails for X11+EGL due to missing gst_gl_display_x11_new_with_display()
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 27 Sep 2016 13:20:16 +0000 (13:20 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 27 Sep 2016 13:20:16 +0000 (13:20 +0000)
https://bugs.webkit.org/show_bug.cgi?id=162606

Patch by Mario Sanchez Prada <mario@endlessm.com> on 2016-09-27
Reviewed by Gustavo Noronha Silva.

Use the right check to retrieve the right instance of GstGLDisplay
depending on whether we're using GLX or EGL, not X11 or Wayland.

* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::MediaPlayerPrivateGStreamerBase::ensureGstGLContext):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@206432 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp

index e6095ab..ff9cd97 100644 (file)
@@ -1,3 +1,16 @@
+2016-09-27  Mario Sanchez Prada  <mario@endlessm.com>
+
+        Build fails for X11+EGL due to missing gst_gl_display_x11_new_with_display()
+        https://bugs.webkit.org/show_bug.cgi?id=162606
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Use the right check to retrieve the right instance of GstGLDisplay
+        depending on whether we're using GLX or EGL, not X11 or Wayland.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+        (WebCore::MediaPlayerPrivateGStreamerBase::ensureGstGLContext):
+
 2016-09-27  Youenn Fablet  <youenn@apple.com>
 
         [GTK][EFL] imported/w3c/web-platform-tests/fetch/api/basic/accept-header.html is failing
index ee12e4f..462289b 100644 (file)
@@ -255,7 +255,11 @@ bool MediaPlayerPrivateGStreamerBase::ensureGstGLContext()
     auto& sharedDisplay = PlatformDisplay::sharedDisplayForCompositing();
     if (!m_glDisplay) {
 #if PLATFORM(X11)
+#if USE(GLX)
         m_glDisplay = GST_GL_DISPLAY(gst_gl_display_x11_new_with_display(downcast<PlatformDisplayX11>(sharedDisplay).native()));
+#elif USE(EGL)
+        m_glDisplay = GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast<PlatformDisplayX11>(sharedDisplay).native()));
+#endif
 #elif PLATFORM(WAYLAND)
         m_glDisplay = GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast<PlatformDisplayWayland>(sharedDisplay).native()));
 #endif