Skip to contentSkip to conversation

package/cog: fix software rendering

PATCH In review James Hilliard 2 participants 4 messages Mar 29, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/cog: fix software rendering

We need to backport a patch to fix software rendering with cog.

---
 ...K_VERSION-macro-name-and-fdo-buffer-.patch | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch
package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch new file +42 -0
new file mode 100644
index 0000000000..fec21c225c
@@ -0,0 +1,42 @@
+From 717fadb2f16fcb28b3b72dc6d796c8ce9ae14afc Mon Sep 17 00:00:00 2001
+From: James Hilliard <[email protected]>
+Date: Sat, 26 Mar 2022 13:30:47 -0600
+Subject: [PATCH] Fix WPE_FDO_CHECK_VERSION macro name and fdo buffer release
+ function name.
+
+(cherry picked from commit d2720103ff8a5c3c5c056487586ed0b5acdc2b91)
+
+Signed-off-by: James Hilliard <[email protected]>
+[[email protected]: backport from upstream commit
+717fadb2f16fcb28b3b72dc6d796c8ce9ae14afc]
+---
+ platform/wayland/cog-platform-wl.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/platform/wayland/cog-platform-wl.c b/platform/wayland/cog-platform-wl.c
+index 0ff9e6f..46c5185 100644
+--- a/platform/wayland/cog-platform-wl.c
++++ b/platform/wayland/cog-platform-wl.c
+@@ -63,7 +63,7 @@
+ 
+ #define DEFAULT_ZOOM_STEP 0.1f
+ 
+-#if defined(WPE_WL_CHECK_VERSION)
++#if defined(WPE_FDO_CHECK_VERSION)
+ #    define HAVE_SHM_EXPORTED_BUFFER WPE_FDO_CHECK_VERSION(1, 9, 0)
+ #    define HAVE_FULLSCREEN_HANDLING WPE_FDO_CHECK_VERSION(1, 11, 1)
+ #else
+@@ -1705,8 +1705,8 @@ static void
+ shm_buffer_destroy(struct shm_buffer *buffer)
+ {
+     if (buffer->exported_buffer) {
+-        wpe_view_backend_exportable_wl_egl_dispatch_release_shm_exported_buffer(wpe_host_data.exportable,
+-                                                                                buffer->exported_buffer);
++        wpe_view_backend_exportable_fdo_egl_dispatch_release_shm_exported_buffer(wpe_host_data.exportable,
++                                                                                 buffer->exported_buffer);
+     }
+ 
+     wl_buffer_destroy(buffer->buffer);
+-- 
+2.25.1
+
Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

Hi James,

Quoted 1 line · On Tue, 29 Mar 2022 10:40:36 -0600 James Hilliard <[email protected]>…

We need to backport a patch to fix software rendering with cog.

I have cherry-picked this fix (and one more) in the cog-0.12 branch, and I am planning to release version 0.12.4 in the next hours. WDYT about waiting until we have that and skip ahead to .4 -- that way it will not be needed to import this patch in Buildroot.

Cheers,
-Adrian

Quoted 56 lines
---
 ...K_VERSION-macro-name-and-fdo-buffer-.patch | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch
package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch new file +42 -0
new file mode 100644
index 0000000000..fec21c225c
@@ -0,0 +1,42 @@
+From 717fadb2f16fcb28b3b72dc6d796c8ce9ae14afc Mon Sep 17 00:00:00 2001
+From: James Hilliard <[email protected]>
+Date: Sat, 26 Mar 2022 13:30:47 -0600
+Subject: [PATCH] Fix WPE_FDO_CHECK_VERSION macro name and fdo buffer release
+ function name.
+
+(cherry picked from commit d2720103ff8a5c3c5c056487586ed0b5acdc2b91)
+
+Signed-off-by: James Hilliard <[email protected]>
+[[email protected]: backport from upstream commit
+717fadb2f16fcb28b3b72dc6d796c8ce9ae14afc]
+---
+ platform/wayland/cog-platform-wl.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/platform/wayland/cog-platform-wl.c b/platform/wayland/cog-platform-wl.c
+index 0ff9e6f..46c5185 100644
+--- a/platform/wayland/cog-platform-wl.c
++++ b/platform/wayland/cog-platform-wl.c
+@@ -63,7 +63,7 @@
+ 
+ #define DEFAULT_ZOOM_STEP 0.1f
+ 
+-#if defined(WPE_WL_CHECK_VERSION)
++#if defined(WPE_FDO_CHECK_VERSION)
+ #    define HAVE_SHM_EXPORTED_BUFFER WPE_FDO_CHECK_VERSION(1, 9, 0)
+ #    define HAVE_FULLSCREEN_HANDLING WPE_FDO_CHECK_VERSION(1, 11, 1)
+ #else
+@@ -1705,8 +1705,8 @@ static void
+ shm_buffer_destroy(struct shm_buffer *buffer)
+ {
+     if (buffer->exported_buffer) {
+-        wpe_view_backend_exportable_wl_egl_dispatch_release_shm_exported_buffer(wpe_host_data.exportable,
+-                                                                                buffer->exported_buffer);
++        wpe_view_backend_exportable_fdo_egl_dispatch_release_shm_exported_buffer(wpe_host_data.exportable,
++                                                                                 buffer->exported_buffer);
+     }
+ 
+     wl_buffer_destroy(buffer->buffer);
+-- 
+2.25.1
+
Signature · 1 line
2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#2 lore raw
Quoted 10 lines · Adrian Perez de Castro

Hi James,

Quoted 1 line · On Tue, 29 Mar 2022 10:40:36 -0600 James Hilliard <[email protected]>…

We need to backport a patch to fix software rendering with cog.

I have cherry-picked this fix (and one more) in the cog-0.12 branch, and I am planning to release version 0.12.4 in the next hours. WDYT about waiting until we have that and skip ahead to .4 -- that way it will not be needed to import this patch in Buildroot.

Yeah, that's probably better.

Quoted 52 lines

Cheers,
-Adrian

Quoted 48 lines
---
 ...K_VERSION-macro-name-and-fdo-buffer-.patch | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch
package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch new file +36 -0
new file mode 100644
index 0000000000..fec21c225c
@@ -0,0 +1,42 @@
+From 717fadb2f16fcb28b3b72dc6d796c8ce9ae14afc Mon Sep 17 00:00:00 2001
+From: James Hilliard <[email protected]>
+Date: Sat, 26 Mar 2022 13:30:47 -0600
+Subject: [PATCH] Fix WPE_FDO_CHECK_VERSION macro name and fdo buffer release
+ function name.
+
+(cherry picked from commit d2720103ff8a5c3c5c056487586ed0b5acdc2b91)
+
+Signed-off-by: James Hilliard <[email protected]>
+[[email protected]: backport from upstream commit
+717fadb2f16fcb28b3b72dc6d796c8ce9ae14afc]
+---
+ platform/wayland/cog-platform-wl.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/platform/wayland/cog-platform-wl.c b/platform/wayland/cog-platform-wl.c
+index 0ff9e6f..46c5185 100644
+--- a/platform/wayland/cog-platform-wl.c
++++ b/platform/wayland/cog-platform-wl.c
+@@ -63,7 +63,7 @@
+
+ #define DEFAULT_ZOOM_STEP 0.1f
+
+-#if defined(WPE_WL_CHECK_VERSION)
++#if defined(WPE_FDO_CHECK_VERSION)
+ #    define HAVE_SHM_EXPORTED_BUFFER WPE_FDO_CHECK_VERSION(1, 9, 0)
+ #    define HAVE_FULLSCREEN_HANDLING WPE_FDO_CHECK_VERSION(1, 11, 1)
+ #else
+@@ -1705,8 +1705,8 @@ static void
+ shm_buffer_destroy(struct shm_buffer *buffer)
+ {
+     if (buffer->exported_buffer) {
+-        wpe_view_backend_exportable_wl_egl_dispatch_release_shm_exported_buffer(wpe_host_data.exportable,
+-                                                                                buffer->exported_buffer);
++        wpe_view_backend_exportable_fdo_egl_dispatch_release_shm_exported_buffer(wpe_host_data.exportable,
++                                                                                 buffer->exported_buffer);
Quoted 8 lines
Quoted 8 lines
package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch new file +6 -1
+     }
+
+     wl_buffer_destroy(buffer->buffer);
+--
+2.25.1
+
--

2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#3 lore raw
In reply to Adrian Perez de Castro
Quoted 7 lines · On Wed, 30 Mar 2022 01:34:03 +0300 Adrian Perez de Castro <[email protected]>…
Quoted 1 line · On Tue, 29 Mar 2022 10:40:36 -0600 James Hilliard <[email protected]>…

We need to backport a patch to fix software rendering with cog.

I have cherry-picked this fix (and one more) in the cog-0.12 branch, and I am planning to release version 0.12.4 in the next hours. WDYT about waiting until we have that and skip ahead to .4 -- that way it will not be needed to import this patch in Buildroot.

Here it goes: https://wpewebkit.org/release/cog-0.12.4.html

Cheers,
-Adrian

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot