mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-09-22 23:30:19 +00:00
weston: update bbappend for version 16.0.x
OE-Core updated weston to version 16.0.0 in master [1] Our bbappend applied 2 patches to version 15.0.x and those need to be updated for version 16.0.0 accordingly. Patch 1 updated to remove fuzz. Patch 2 removed as it was accepted upstream. [1] https://git.openembedded.org/openembedded-core/commit/?id=ad85da159d415f1aad6ea9fb50cd1b630a89692e Signed-off-by: Denys Dmytriyenko (TI) <denys@konsulko.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
This commit is contained in:
committed by
Ryan Eatmon
parent
b2c5a3d2e6
commit
2db87cfca8
@@ -4,5 +4,4 @@ PR:append = ".tisoc1"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-Revert-require-GL_EXT_unpack_subimage-commit.patch \
|
||||
file://0002-surface-state-Fix-assert-firing-when-subsurfaces-hav.patch \
|
||||
"
|
||||
|
||||
+7
-10
@@ -1,4 +1,4 @@
|
||||
From 3cddacaa9ea3cfd75732ea9a84312fa68e0bfda7 Mon Sep 17 00:00:00 2001
|
||||
From a64f81b25e678026fa2d6a6715a9c63823235dd5 Mon Sep 17 00:00:00 2001
|
||||
From: Ryan Eatmon <reatmon@ti.com>
|
||||
Date: Tue, 24 Mar 2026 10:52:59 -0500
|
||||
Subject: [PATCH] Revert require GL_EXT_unpack_subimage commit
|
||||
@@ -20,10 +20,10 @@ Signed-off-by: Ryan Eatmon <reatmon@ti.com>
|
||||
2 files changed, 23 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/libweston/renderer-gl/gl-renderer-internal.h b/libweston/renderer-gl/gl-renderer-internal.h
|
||||
index 1afffbda..dbf7b1c3 100644
|
||||
index 1752db2..6a27019 100644
|
||||
--- a/libweston/renderer-gl/gl-renderer-internal.h
|
||||
+++ b/libweston/renderer-gl/gl-renderer-internal.h
|
||||
@@ -526,6 +526,8 @@ struct gl_renderer {
|
||||
@@ -558,6 +558,8 @@ struct gl_renderer {
|
||||
struct weston_log_scope *shader_scope;
|
||||
|
||||
struct dmabuf_allocator *allocator;
|
||||
@@ -33,10 +33,10 @@ index 1afffbda..dbf7b1c3 100644
|
||||
|
||||
static inline uint32_t
|
||||
diff --git a/libweston/renderer-gl/gl-renderer.c b/libweston/renderer-gl/gl-renderer.c
|
||||
index 45a2a148..8b238208 100644
|
||||
index 81bb5e5..0e04073 100644
|
||||
--- a/libweston/renderer-gl/gl-renderer.c
|
||||
+++ b/libweston/renderer-gl/gl-renderer.c
|
||||
@@ -3021,6 +3021,22 @@ gl_renderer_flush_damage(struct weston_paint_node *pnode)
|
||||
@@ -3404,6 +3404,22 @@ gl_renderer_flush_damage(struct weston_paint_node *pnode)
|
||||
|
||||
data = wl_shm_buffer_get_data(buffer->shm_buffer);
|
||||
|
||||
@@ -59,7 +59,7 @@ index 45a2a148..8b238208 100644
|
||||
if (gb->needs_full_upload || quirks->force_full_upload) {
|
||||
wl_shm_buffer_begin_access(buffer->shm_buffer);
|
||||
|
||||
@@ -5171,11 +5187,9 @@ gl_renderer_setup(struct weston_compositor *ec)
|
||||
@@ -5652,11 +5668,9 @@ gl_renderer_setup(struct weston_compositor *ec)
|
||||
else
|
||||
ec->read_format = pixel_format_get_info(DRM_FORMAT_ABGR8888);
|
||||
|
||||
@@ -74,7 +74,7 @@ index 45a2a148..8b238208 100644
|
||||
|
||||
if (gl_extensions_has(gr, EXTENSION_OES_MAPBUFFER))
|
||||
GET_PROC_ADDRESS(gr->unmap_buffer, "glUnmapBufferOES");
|
||||
@@ -5303,6 +5317,8 @@ gl_renderer_setup(struct weston_compositor *ec)
|
||||
@@ -5792,6 +5806,8 @@ gl_renderer_setup(struct weston_compositor *ec)
|
||||
gl_version_minor(gr->gl_version));
|
||||
weston_log_continue(STAMP_SPACE "read-back format: %s\n",
|
||||
ec->read_format->drm_format_name);
|
||||
@@ -83,6 +83,3 @@ index 45a2a148..8b238208 100644
|
||||
weston_log_continue(STAMP_SPACE "glReadPixels supports y-flip: %s\n",
|
||||
yesno(gl_extensions_has(gr, EXTENSION_ANGLE_PACK_REVERSE_ROW_ORDER)));
|
||||
weston_log_continue(STAMP_SPACE "glReadPixels supports PBO: %s\n",
|
||||
--
|
||||
2.43.0
|
||||
|
||||
|
||||
-47
@@ -1,47 +0,0 @@
|
||||
From 12ecd8d4b5095c120efef76493546ead3f41ab5b Mon Sep 17 00:00:00 2001
|
||||
From: Derek Foreman <derek.foreman@collabora.com>
|
||||
Date: Wed, 27 May 2026 14:12:36 -0500
|
||||
Subject: [PATCH] surface-state: Fix assert firing when subsurfaces have no
|
||||
views
|
||||
|
||||
Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/2085]
|
||||
|
||||
I've not been able to reproduce this, but have a report that this fires
|
||||
when running Chromium on aarch64.
|
||||
|
||||
It seems plausible that we can get here when none of the subsurfaces have
|
||||
views, and thus the flag won't be set.
|
||||
|
||||
Let's just remove the assert.
|
||||
|
||||
Fixes 6a280a8f
|
||||
Fixes #1117
|
||||
|
||||
Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
|
||||
Signed-off-by: Thorsten Lannynd <t-lannynd@ti.com>
|
||||
---
|
||||
libweston/surface-state.c | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/libweston/surface-state.c b/libweston/surface-state.c
|
||||
index 3c31a0aa..65dc70bb 100644
|
||||
--- a/libweston/surface-state.c
|
||||
+++ b/libweston/surface-state.c
|
||||
@@ -268,7 +268,6 @@ weston_surface_attach(struct weston_surface *surface,
|
||||
static void
|
||||
weston_surface_apply_subsurface_order(struct weston_surface *surface)
|
||||
{
|
||||
- struct weston_compositor *comp = surface->compositor;
|
||||
struct weston_subsurface *sub;
|
||||
struct weston_view *view;
|
||||
|
||||
@@ -279,7 +278,6 @@ weston_surface_apply_subsurface_order(struct weston_surface *surface)
|
||||
wl_list_for_each(view, &sub->surface->views, surface_link)
|
||||
weston_view_geometry_dirty(view);
|
||||
}
|
||||
- weston_assert_true(comp, comp->view_list_needs_rebuild);
|
||||
}
|
||||
|
||||
/* Translate pending damage in buffer co-ordinates to surface
|
||||
--
|
||||
2.34.1
|
||||
Reference in New Issue
Block a user