Changeset 150440 in webkit

Timestamp:

May 21, 2013 6:37:17 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Always use EGL to create the GL context when running on Wayland
​https://bugs.webkit.org/show_bug.cgi?id=115721

Patch by Iago Toral Quiroga <​itoral@igalia.com> on 2013-05-21
Reviewed by Martin Robinson.

• platform/graphics/cairo/GLContext.cpp:

(WebCore::GLContext::createContextForWindow):
(WebCore::GLContext::createOffscreenContext): Always use EGL to create the GL context
instead of GLX when running on Wayland and make createOffScreenContext reuse the code
in createContextWindow.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cairo/GLContext.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-21  Iago Toral Quiroga  <itoral@igalia.com>
+
+        [GTK] Always use EGL to create the GL context when running on Wayland
+        https://bugs.webkit.org/show_bug.cgi?id=115721
+
+        Reviewed by Martin Robinson.
+
+        * platform/graphics/cairo/GLContext.cpp:
+        (WebCore::GLContext::createContextForWindow):
+        (WebCore::GLContext::createOffscreenContext): Always use EGL to create the GL context
+        instead of GLX when running on Wayland and make createOffScreenContext reuse the code
+        in createContextWindow.
+
 2013-05-21  Alberto Garcia  <agarcia@igalia.com>
 

trunk/Source/WebCore/platform/graphics/cairo/GLContext.cpp

@@ -28 +28 @@
 #if PLATFORM(X11)
 #include <X11/Xlib.h>
+#endif
+
+#if PLATFORM(GTK)
+#include <gdk/gdk.h>
+#ifndef GTK_API_VERSION_2
+#ifdef GDK_WINDOWING_WAYLAND
+#include <gdk/gdkwayland.h>
+#endif
+#endif
 #endif
 
@@ -114 +123 @@
 PassOwnPtr<GLContext> GLContext::createContextForWindow(uint64_t windowHandle, GLContext* sharingContext)
 {
+#if PLATFORM(GTK) && defined(GDK_WINDOWING_WAYLAND) && USE(EGL)
+    GdkDisplay* display = gdk_display_manager_get_default_display(gdk_display_manager_get());
+
+    if (GDK_IS_WAYLAND_DISPLAY(display)) {
+        if (OwnPtr<GLContext> eglContext = GLContextEGL::createContext(windowHandle, sharingContext))
+            return eglContext.release();
+        return nullptr;
+    }
+#endif
+
 #if USE(GLX)
     if (OwnPtr<GLContext> glxContext = GLContextGLX::createContext(windowHandle, sharingContext))
@@ -132 +151 @@
 PassOwnPtr<GLContext> GLContext::createOffscreenContext(GLContext* sharingContext)
 {
-#if USE(GLX)
-    if (OwnPtr<GLContext> glxContext = GLContextGLX::createContext(0, sharingContext))
-        return glxContext.release();
-#endif
-#if USE(EGL)
-    if (OwnPtr<GLContext> eglContext = GLContextEGL::createContext(0, sharingContext))
-        return eglContext.release();
-#endif
-    return nullptr;
+    return createContextForWindow(0, sharingContext);
 }