Changeset 173716 in webkit

Timestamp:

Sep 17, 2014, 11:21:55 PM (11 years ago)

Author:

zandobersek@gmail.com

Message:

[GTK] Add Wayland support to GLContextEGL
​https://bugs.webkit.org/show_bug.cgi?id=136829

Reviewed by Martin Robinson.

• platform/graphics/egl/GLContextEGL.cpp:

(WebCore::sharedEGLDisplay): Special-case the shared EGL display initialization
for the GTK port when running under Wayland. In that case the pointer to the
native wl_display object should be passed to eglGetDisplay(). If not running
under Wayland we should fall back to using the shared X11 display (if support
for that display system is enabled) or the EGL_DEFAULT_DISPLAY.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/egl/GLContextEGL.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-09-17  Iago Toral  <itoral@igalia.com> and Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK] Add Wayland support to GLContextEGL
+        https://bugs.webkit.org/show_bug.cgi?id=136829
+
+        Reviewed by Martin Robinson.
+
+        * platform/graphics/egl/GLContextEGL.cpp:
+        (WebCore::sharedEGLDisplay): Special-case the shared EGL display initialization
+        for the GTK port when running under Wayland. In that case the pointer to the
+        native wl_display object should be passed to eglGetDisplay(). If not running
+        under Wayland we should fall back to using the shared X11 display (if support
+        for that display system is enabled) or the EGL_DEFAULT_DISPLAY.
+
 2014-09-17  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp

@@ -36 +36 @@
 #endif
 
+#if PLATFORM(GTK)
+#include "GtkUtilities.h"
+#if PLATFORM(WAYLAND) && !defined(GTK_API_VERSION_2)
+#include "WaylandDisplay.h"
+#endif
+#endif
+
 #if ENABLE(ACCELERATED_2D_CANVAS)
 // cairo-gl.h includes some definitions from GLX that conflict with
@@ -59 +66 @@
     if (!initialized) {
         initialized = true;
+#if PLATFORM(GTK) && PLATFORM(WAYLAND) && !defined(GTK_API_VERSION_2)
+        if (getDisplaySystemType() == DisplaySystemType::Wayland && WaylandDisplay::instance())
+            gSharedEGLDisplay = eglGetDisplay(WaylandDisplay::instance()->nativeDisplay());
+        else // Note that this branch continutes outside this #if-guarded segment.
+#endif
 #if PLATFORM(X11)
-        gSharedEGLDisplay = eglGetDisplay(GLContext::sharedX11Display());
-#else
-        gSharedEGLDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+            gSharedEGLDisplay = eglGetDisplay(GLContext::sharedX11Display());
+#else
+            gSharedEGLDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
 #endif
         if (gSharedEGLDisplay != EGL_NO_DISPLAY && (!eglInitialize(gSharedEGLDisplay, 0, 0) || !eglBindAPI(gGLAPI)))