From patchwork Thu Feb 1 17:40:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 38574 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id F4168C4828D for ; Thu, 1 Feb 2024 17:40:43 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.1549.1706809233805062494 for ; Thu, 01 Feb 2024 09:40:34 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 2A25B40C50; Thu, 1 Feb 2024 17:40:33 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id F9EwwwBFPykF; Thu, 1 Feb 2024 17:40:33 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 06FDD40AB7; Thu, 1 Feb 2024 17:40:31 +0000 (UTC) Received: from thorin.han-sole.ts.net (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 85383163DEB; Thu, 1 Feb 2024 12:40:31 -0500 (EST) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][PATCH 1/2] weston: update to version 13 Date: Thu, 1 Feb 2024 12:40:28 -0500 Message-Id: <20240201174029.2592430-1-denis@denix.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 01 Feb 2024 17:40:43 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15101 From: Denys Dmytriyenko Update bbappend from 12.0.2 to 13.0.0 and rework the local patch to apply cleanly. Signed-off-by: Denys Dmytriyenko --- ...equire-GL_EXT_unpack_subimage-commit.patch | 77 +++++++++---------- ...12.0.2.bbappend => weston_13.0.0.bbappend} | 0 2 files changed, 38 insertions(+), 39 deletions(-) rename meta-arago-distro/recipes-graphics/wayland/{weston_12.0.2.bbappend => weston_13.0.0.bbappend} (100%) diff --git a/meta-arago-distro/recipes-graphics/wayland/weston/0001-Revert-require-GL_EXT_unpack_subimage-commit.patch b/meta-arago-distro/recipes-graphics/wayland/weston/0001-Revert-require-GL_EXT_unpack_subimage-commit.patch index 8b77e4c8..1a466e7b 100644 --- a/meta-arago-distro/recipes-graphics/wayland/weston/0001-Revert-require-GL_EXT_unpack_subimage-commit.patch +++ b/meta-arago-distro/recipes-graphics/wayland/weston/0001-Revert-require-GL_EXT_unpack_subimage-commit.patch @@ -1,4 +1,4 @@ -From 14513f40b8776b2c75d28368cbeb6393fe89fef1 Mon Sep 17 00:00:00 2001 +From 5a05e5b66dd3831a9c9c2b3f64bd42419d9ade2d Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Thu, 6 Jul 2023 01:48:41 +0000 Subject: [PATCH] Revert require GL_EXT_unpack_subimage commit @@ -13,40 +13,41 @@ Upstream-Status: Inappropriate [specific to TI SGX] Signed-off-by: Andrew Davis Signed-off-by: Denys Dmytriyenko + --- libweston/renderer-gl/gl-renderer-internal.h | 2 ++ libweston/renderer-gl/gl-renderer.c | 29 ++++++++++++++++---- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/libweston/renderer-gl/gl-renderer-internal.h b/libweston/renderer-gl/gl-renderer-internal.h -index 888df84..cabf1ed 100644 +index 5032035..85616c9 100644 --- a/libweston/renderer-gl/gl-renderer-internal.h +++ b/libweston/renderer-gl/gl-renderer-internal.h -@@ -153,6 +153,8 @@ struct gl_renderer { - PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC create_platform_window; - bool has_platform_base; - +@@ -160,6 +160,8 @@ struct gl_renderer { + PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC create_platform_window; + bool has_platform_base; + + bool has_unpack_subimage; + - PFNEGLBINDWAYLANDDISPLAYWL bind_display; - PFNEGLUNBINDWAYLANDDISPLAYWL unbind_display; - PFNEGLQUERYWAYLANDBUFFERWL query_buffer; + PFNEGLBINDWAYLANDDISPLAYWL bind_display; + PFNEGLUNBINDWAYLANDDISPLAYWL unbind_display; + PFNEGLQUERYWAYLANDBUFFERWL query_buffer; diff --git a/libweston/renderer-gl/gl-renderer.c b/libweston/renderer-gl/gl-renderer.c -index 4a6da14..3cddf6e 100644 +index ccb41e6..38a0e0c 100644 --- a/libweston/renderer-gl/gl-renderer.c +++ b/libweston/renderer-gl/gl-renderer.c -@@ -1970,6 +1970,7 @@ gl_renderer_flush_damage(struct weston_surface *surface, +@@ -2106,6 +2106,7 @@ gl_renderer_flush_damage(struct weston_surface *surface, { - const struct weston_testsuite_quirks *quirks = - &surface->compositor->test_data.test_quirks; + const struct weston_testsuite_quirks *quirks = + &surface->compositor->test_data.test_quirks; + struct gl_renderer *gr = get_renderer(surface->compositor); - struct gl_surface_state *gs = get_surface_state(surface); - struct gl_buffer_state *gb = gs->buffer; - struct weston_view *view; -@@ -2012,6 +2013,24 @@ gl_renderer_flush_damage(struct weston_surface *surface, - - glActiveTexture(GL_TEXTURE0); - + struct gl_surface_state *gs = get_surface_state(surface); + struct gl_buffer_state *gb = gs->buffer; + struct weston_paint_node *pnode; +@@ -2152,6 +2153,24 @@ gl_renderer_flush_damage(struct weston_surface *surface, + + glActiveTexture(GL_TEXTURE0); + + if (!gr->has_unpack_subimage) { + wl_shm_buffer_begin_access(buffer->shm_buffer); + for (j = 0; j < gs->buffer->num_textures; j++) { @@ -65,13 +66,13 @@ index 4a6da14..3cddf6e 100644 + goto done; + } + - if (gb->needs_full_upload || quirks->gl_force_full_upload) { - glPixelStorei(GL_UNPACK_SKIP_PIXELS_EXT, 0); - glPixelStorei(GL_UNPACK_SKIP_ROWS_EXT, 0); -@@ -4103,11 +4122,9 @@ gl_renderer_setup(struct weston_compositor *ec, EGLSurface egl_surface) - else - ec->read_format = pixel_format_get_info_by_pixman(PIXMAN_a8b8g8r8); - + if (gb->needs_full_upload || quirks->gl_force_full_upload) { + glPixelStorei(GL_UNPACK_SKIP_PIXELS_EXT, 0); + glPixelStorei(GL_UNPACK_SKIP_ROWS_EXT, 0); +@@ -4169,11 +4188,9 @@ gl_renderer_setup(struct weston_compositor *ec) + else + ec->read_format = pixel_format_get_info(DRM_FORMAT_ABGR8888); + - if (gr->gl_version < gr_gl_version(3, 0) && - !weston_check_egl_extension(extensions, "GL_EXT_unpack_subimage")) { - weston_log("GL_EXT_unpack_subimage not available.\n"); @@ -80,17 +81,15 @@ index 4a6da14..3cddf6e 100644 + if (gr->gl_version >= gr_gl_version(3, 0) || + weston_check_egl_extension(extensions, "GL_EXT_unpack_subimage")) + gr->has_unpack_subimage = true; - - if (gr->gl_version >= gr_gl_version(3, 0) || - weston_check_egl_extension(extensions, "GL_EXT_texture_type_2_10_10_10_REV")) -@@ -4194,6 +4211,8 @@ gl_renderer_setup(struct weston_compositor *ec, EGLSurface egl_surface) - gr_gl_version_minor(gr->gl_version)); - weston_log_continue(STAMP_SPACE "read-back format: %s\n", - ec->read_format->drm_format_name); + + if (gr->gl_version >= gr_gl_version(3, 0) || + weston_check_egl_extension(extensions, "GL_EXT_texture_type_2_10_10_10_REV")) +@@ -4268,6 +4285,8 @@ gl_renderer_setup(struct weston_compositor *ec) + gr_gl_version_minor(gr->gl_version)); + weston_log_continue(STAMP_SPACE "read-back format: %s\n", + ec->read_format->drm_format_name); + weston_log_continue(STAMP_SPACE "wl_shm sub-image to texture: %s\n", + gr->has_unpack_subimage ? "yes" : "no"); - weston_log_continue(STAMP_SPACE "glReadPixels supports y-flip: %s\n", - yesno(gr->has_pack_reverse)); - weston_log_continue(STAMP_SPACE "wl_shm 10 bpc formats: %s\n", --- -2.25.1 + weston_log_continue(STAMP_SPACE "glReadPixels supports y-flip: %s\n", + yesno(gr->has_pack_reverse)); + weston_log_continue(STAMP_SPACE "wl_shm 10 bpc formats: %s\n", diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_12.0.2.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston_13.0.0.bbappend similarity index 100% rename from meta-arago-distro/recipes-graphics/wayland/weston_12.0.2.bbappend rename to meta-arago-distro/recipes-graphics/wayland/weston_13.0.0.bbappend From patchwork Thu Feb 1 17:40:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 38573 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id EBF74C48286 for ; Thu, 1 Feb 2024 17:40:43 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.1537.1706809235049859432 for ; Thu, 01 Feb 2024 09:40:36 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 65BB640CBA; Thu, 1 Feb 2024 17:40:34 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NAa5vg_A9GmK; Thu, 1 Feb 2024 17:40:34 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 398BF40AB7; Thu, 1 Feb 2024 17:40:33 +0000 (UTC) Received: from thorin.han-sole.ts.net (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id EF6F5163DF1; Thu, 1 Feb 2024 12:40:32 -0500 (EST) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][PATCH 2/2] libnl: update for 3.9.0 Date: Thu, 1 Feb 2024 12:40:29 -0500 Message-Id: <20240201174029.2592430-2-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240201174029.2592430-1-denis@denix.org> References: <20240201174029.2592430-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 01 Feb 2024 17:40:43 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15102 From: Denys Dmytriyenko Update bbappend for 3.9.0 release. The location of the private headers has changed slightly, adjust accordingly. Signed-off-by: Denys Dmytriyenko --- .../libnl/{libnl_3.7.0.bbappend => libnl_3.9.0.bbappend} | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) rename meta-arago-distro/recipes-support/libnl/{libnl_3.7.0.bbappend => libnl_3.9.0.bbappend} (22%) diff --git a/meta-arago-distro/recipes-support/libnl/libnl_3.7.0.bbappend b/meta-arago-distro/recipes-support/libnl/libnl_3.9.0.bbappend similarity index 22% rename from meta-arago-distro/recipes-support/libnl/libnl_3.7.0.bbappend rename to meta-arago-distro/recipes-support/libnl/libnl_3.9.0.bbappend index 523335c4..26c9b6de 100644 --- a/meta-arago-distro/recipes-support/libnl/libnl_3.7.0.bbappend +++ b/meta-arago-distro/recipes-support/libnl/libnl_3.9.0.bbappend @@ -2,7 +2,8 @@ PR:append = ".arago0" do_install:append() { # Install private files to allow libnl extensions - install -d ${D}${includedir}/netlink-private - cp -r ${S}/include/netlink-private/cache-api.h ${D}${includedir}/netlink-private/ - cp -r ${S}/include/netlink-private/object-api.h ${D}${includedir}/netlink-private/ + install -d ${D}${includedir}/nl-priv-dynamic-core + cp -r ${S}/include/nl-priv-dynamic-core/cache-api.h ${D}${includedir}/nl-priv-dynamic-core/ + cp -r ${S}/include/nl-priv-dynamic-core/object-api.h ${D}${includedir}/nl-priv-dynamic-core/ + cp -r ${S}/include/nl-priv-dynamic-core/nl-core.h ${D}${includedir}/nl-priv-dynamic-core/ }