Bug 162606 – Build fails for X11+EGL due to missing gst_gl_display_x11_new_with_display()

• Status: RESOLVED
• Resolution: FIXED
• Component: WebCore Misc.

[Mario Sanchez Prada]

In MediaPlayerPrivateGStreamerBase::ensureGstGLContext() [1] a call to either gst_gl_display_x11_new_with_display() or gst_gl_display_egl_new_with_egl_display() is made depending on whether we're building for X11 or Wayland:
  [...]
  #if PLATFORM(X11)
          m_glDisplay = GST_GL_DISPLAY(gst_gl_display_x11_new_with_display(downcast<PlatformDisplayX11>(sharedDisplay).native()));
  #elif PLATFORM(WAYLAND)
          m_glDisplay = GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast<PlatformDisplayWayland>(sharedDisplay).native()));
  #endif
  [...]

However, this will fail when building for X11 with EGL (instead of GLX), since gst_gl_display_x11_new_with_display() is defined in /usr/include/gst/gl/x11/gstgldisplay_x11.h, which doesn't get included for EGL:

  [...]
  #include "GLContext.h"
  #if USE(GLX)
  #include "GLContextGLX.h"
  #include <gst/gl/x11/gstgldisplay_x11.h>
  #elif USE(EGL)
  #include "GLContextEGL.h"
  #include <gst/gl/egl/gstgldisplay_egl.h>
  #endif
  [...]

I believe a simple fix is to change the condition there to check for GLX or EGL, instead of X11 or WAYLAND.

[1] https://svn.webkit.org/repository/webkit/trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp

[Mario Sanchez Prada]

Created attachment 289935 [details]
Patch proposal

This is the patch I'm using in my ARM + X11 environment.

Please review, thanks!

[Gustavo Noronha (kov)]

Comment on attachment 289935 [details]
Patch proposal

View in context: https://bugs.webkit.org/attachment.cgi?id=289935&action=review

> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:260
> -#elif PLATFORM(WAYLAND)
> -        m_glDisplay = GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast<PlatformDisplayWayland>(sharedDisplay).native()));
> +#elif USE(EGL)
> +        m_glDisplay = GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast<PlatformDisplayX11>(sharedDisplay).native()));

Now we're missing the Wayland case? I guess you should start with PLATFORM(WAYLAND) and elif USE(GLX), elif USE(EGL)?

[Mario Sanchez Prada]

Created attachment 289936 [details]
Patch proposal

(In reply to comment #2)
> Comment on attachment 289935 [details]
> Patch proposal
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=289935&action=review
> 
> > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:260
> > -#elif PLATFORM(WAYLAND)
> > -        m_glDisplay = GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast<PlatformDisplayWayland>(sharedDisplay).native()));
> > +#elif USE(EGL)
> > +        m_glDisplay = GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast<PlatformDisplayX11>(sharedDisplay).native()));
> 
> Now we're missing the Wayland case? I guess you should start with
> PLATFORM(WAYLAND) and elif USE(GLX), elif USE(EGL)?

I'm an idiot. Forgot about the downcasting, see the new patch now

[Gustavo Noronha (kov)]

Comment on attachment 289936 [details]
Patch proposal

\o/

[WebKit Commit Bot]

Comment on attachment 289936 [details]
Patch proposal

Clearing flags on attachment: 289936

Committed r206432: <http://trac.webkit.org/changeset/206432>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.