Changeset 246257 in webkit

Timestamp:

Jun 10, 2019 7:04:12 AM (5 years ago)

Author:

Philippe Normand

Message:

[WPE][Qt] Port to new wpe_fdo_egl_exported_image API
​https://bugs.webkit.org/show_bug.cgi?id=198713

Reviewed by Carlos Garcia Campos.

.:

• Source/cmake/OptionsWPE.cmake:

Source/WebKit:

• UIProcess/API/wpe/qt/WPEQtViewBackend.cpp:

(WPEQtViewBackend::WPEQtViewBackend):
(WPEQtViewBackend::texture):
(WPEQtViewBackend::displayImage):

• UIProcess/API/wpe/qt/WPEQtViewBackend.h:

Tools:

• flatpak/org.webkit.WPEModules.yaml: Include wpebackend-fdo

patches currently used in JHBuild.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/PlatformWPE.cmake (modified) (2 diffs)
• Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewBackend.cpp (modified) (3 diffs)
• Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewBackend.h (modified) (2 diffs)
• Source/cmake/OptionsWPE.cmake (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/flatpak/org.webkit.WPEModules.yaml (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2019-06-10  Philippe Normand  <pnormand@igalia.com>
+
+        [WPE][Qt] Port to new wpe_fdo_egl_exported_image API
+        https://bugs.webkit.org/show_bug.cgi?id=198713
+
+        Reviewed by Carlos Garcia Campos.
+
+        * Source/cmake/OptionsWPE.cmake:
+
 2019-06-04  Takashi Komori  <Takashi.Komori@sony.com>
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-06-10  Philippe Normand  <pnormand@igalia.com>
+
+        [WPE][Qt] Port to new wpe_fdo_egl_exported_image API
+        https://bugs.webkit.org/show_bug.cgi?id=198713
+
+        Reviewed by Carlos Garcia Campos.
+
+        * UIProcess/API/wpe/qt/WPEQtViewBackend.cpp:
+        (WPEQtViewBackend::WPEQtViewBackend):
+        (WPEQtViewBackend::texture):
+        (WPEQtViewBackend::displayImage):
+        * UIProcess/API/wpe/qt/WPEQtViewBackend.h:
+
 2019-06-09  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit/PlatformWPE.cmake

@@ -378 +378 @@
         WebKit
         ${LIBEPOXY_LIBRARIES}
-        ${WPE_BACKEND_FDO_LIBRARIES}
+        ${WPEBACKEND_FDO_LIBRARIES}
     )
 
@@ -385 +385 @@
         ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
         ${LIBEPOXY_INCLUDE_DIRS}
-        ${WPE_BACKEND_FDO_INCLUDE_DIRS}
+        ${WPEBACKEND_FDO_INCLUDE_DIRS}
     )
 

trunk/Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewBackend.cpp

@@ -114 +114 @@
 
     static struct wpe_view_backend_exportable_fdo_egl_client exportableClient = {
-        // export_buffer_resource
-        [](void* data, EGLImageKHR image)
+        // export_egl_image
+        nullptr,
+        [](void* data, struct wpe_fdo_egl_exported_image* image)
         {
             static_cast<WPEQtViewBackend*>(data)->displayImage(image);
         },
         // padding
-        nullptr, nullptr, nullptr, nullptr
+        nullptr, nullptr, nullptr
     };
 
@@ -172 +173 @@
     glFunctions->glActiveTexture(GL_TEXTURE0);
     glFunctions->glBindTexture(GL_TEXTURE_2D, m_textureId);
-    imageTargetTexture2DOES(GL_TEXTURE_2D, m_lockedImage);
+    imageTargetTexture2DOES(GL_TEXTURE_2D, wpe_fdo_egl_exported_image_get_egl_image(m_lockedImage));
     glFunctions->glUniform1i(m_textureUniform, 0);
 
@@ -201 +202 @@
 
     wpe_view_backend_exportable_fdo_dispatch_frame_complete(m_exportable);
-    wpe_view_backend_exportable_fdo_egl_dispatch_release_image(m_exportable, m_lockedImage);
-    m_lockedImage = EGL_NO_IMAGE_KHR;
+    wpe_view_backend_exportable_fdo_egl_dispatch_release_exported_image(m_exportable, m_lockedImage);
+    m_lockedImage = nullptr;
 
     return m_textureId;
 }
 
-void WPEQtViewBackend::displayImage(EGLImageKHR image)
-{
-    RELEASE_ASSERT(m_lockedImage == EGL_NO_IMAGE_KHR);
+void WPEQtViewBackend::displayImage(struct wpe_fdo_egl_exported_image* image)
+{
+    RELEASE_ASSERT(!m_lockedImage);
     m_lockedImage = image;
     if (m_view)

trunk/Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewBackend.h

@@ -62 +62 @@
 
 private:
-    void displayImage(EGLImageKHR);
+    void displayImage(struct wpe_fdo_egl_exported_image*);
     uint32_t modifiers() const;
 
@@ -68 +68 @@
     EGLContext m_eglContext { nullptr };
     struct wpe_view_backend_exportable_fdo* m_exportable { nullptr };
-
-    EGLImageKHR m_lockedImage { EGL_NO_IMAGE_KHR };
+    struct wpe_fdo_egl_exported_image* m_lockedImage { nullptr };
 
     QPointer<WPEQtView> m_view;

trunk/Source/cmake/OptionsWPE.cmake

@@ -173 +173 @@
     find_package(Qt5Test REQUIRED)
     find_package(PkgConfig)
-    pkg_check_modules(WPE_BACKEND_FDO REQUIRED wpebackend-fdo-1.0)
+    find_package(WPEBackend-fdo 1.3.0 REQUIRED)
 endif ()
 

trunk/Tools/ChangeLog

@@ +1 @@
+2019-06-10  Philippe Normand  <pnormand@igalia.com>
+
+        [WPE][Qt] Port to new wpe_fdo_egl_exported_image API
+        https://bugs.webkit.org/show_bug.cgi?id=198713
+
+        Reviewed by Carlos Garcia Campos.
+
+        * flatpak/org.webkit.WPEModules.yaml: Include wpebackend-fdo
+        patches currently used in JHBuild.
+
 2019-06-10  Adrian Perez de Castro  <aperez@igalia.com>
 

trunk/Tools/flatpak/org.webkit.WPEModules.yaml

@@ -11 +11 @@
       url: https://wpewebkit.org/releases/wpebackend-fdo-1.3.0.tar.xz
       sha256: fed9ab29f5d53cf465188da80d014f3aa067c77704f8508c6bd17971fded359d
+    - type: patch
+      path: ../gtk/patches/wpebackend-fdo-Handle-the-case-of-new-target-created-for-the-same-v.patch
+    - type: patch
+      path: ../gtk/wpebackend-fdo-view-backend-exportable-private-don-t-double-free-ca.patch