Changeset 263263 in webkit

Timestamp:

Jun 19, 2020 6:40:11 AM (4 years ago)

Author:

Lauro Moura

Message:

[WPE] Warn potential issues when creating WindowViewBackend
​https://bugs.webkit.org/show_bug.cgi?id=213326

Reviewed by Philippe Normand.

Make it easier to debug eventual GL issues when starting up MiniBrowser in
windowed mode.

• wpe/backends/WindowViewBackend.cpp:

(WPEToolingBackends::WaylandEGLConnection::singleton):
(WPEToolingBackends::WindowViewBackend::WindowViewBackend):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• wpe/backends/WindowViewBackend.cpp (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-06-19  Lauro Moura  <lmoura@igalia.com>
+
+        [WPE] Warn potential issues when creating WindowViewBackend
+        https://bugs.webkit.org/show_bug.cgi?id=213326
+
+        Reviewed by Philippe Normand.
+
+        Make it easier to debug eventual GL issues when starting up MiniBrowser in
+        windowed mode.
+
+        * wpe/backends/WindowViewBackend.cpp:
+        (WPEToolingBackends::WaylandEGLConnection::singleton):
+        (WPEToolingBackends::WindowViewBackend::WindowViewBackend):
+
 2020-06-19  Lauro Moura  <lmoura@igalia.com>
 

trunk/Tools/wpe/backends/WindowViewBackend.cpp

@@ -60 +60 @@
             [] {
                 s_connection.display = wl_display_connect(nullptr);
-                if (!s_connection.display)
+                if (!s_connection.display) {
+                    g_warning("WaylandEGLConnection: Could not connect to Wayland Display");
                     return;
+                }
 
                 EGLDisplay eglDisplay = eglGetDisplay(s_connection.display);
-                if (eglDisplay == EGL_NO_DISPLAY)
+                if (eglDisplay == EGL_NO_DISPLAY) {
+                    g_warning("WaylandEGLConnection: No EGL Display available in this connection");
                     return;
-
-                if (!eglInitialize(eglDisplay, nullptr, nullptr) || !eglBindAPI(EGL_OPENGL_ES_API))
+                }
+
+                if (!eglInitialize(eglDisplay, nullptr, nullptr) || !eglBindAPI(EGL_OPENGL_ES_API)) {
+                    g_warning("WaylandEGLConnection: Failed to initialize and bind the EGL Display");
                     return;
+                }
 
                 s_connection.eglDisplay = eglDisplay;
@@ -513 +519 @@
 
     auto& connection = WaylandEGLConnection::singleton();
-    if (!connection.display)
+    if (!connection.display) {
+        g_warning("WindowViewBackend: No Wayland EGL connection available");
         return;
-
-    if (connection.eglDisplay == EGL_NO_DISPLAY || !initialize(connection.eglDisplay))
+    }
+
+    if (connection.eglDisplay == EGL_NO_DISPLAY || !initialize(connection.eglDisplay)) {
+        g_warning("WindowViewBackend: Could not initialize EGL display");
         return;
+    }
 
     {
@@ -564 +574 @@
         reinterpret_cast<PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC>(eglGetProcAddress("eglCreatePlatformWindowSurfaceEXT"));
     m_eglSurface = createPlatformWindowSurface(connection.eglDisplay, m_eglConfig, m_eglWindow, nullptr);
-    if (!m_eglSurface)
+    if (!m_eglSurface) {
+        g_warning("WindowViewBackend: Could not create EGL platform window surface");
         return;
-
-    if (!eglMakeCurrent(connection.eglDisplay, m_eglSurface, m_eglSurface, m_eglContext))
+    }
+
+    if (!eglMakeCurrent(connection.eglDisplay, m_eglSurface, m_eglSurface, m_eglContext)) {
+        g_warning("WindowViewBackend: Could not make EGL surface current");
         return;
+    }
 
     imageTargetTexture2DOES = reinterpret_cast<PFNGLEGLIMAGETARGETTEXTURE2DOESPROC>(eglGetProcAddress("glEGLImageTargetTexture2DOES"));