recipes-graphics: Add weston fix for SGX from meta-arago
PATCH 1/1 recipes-graphics: Add weston fix for SGX from meta-arago
This change is needed due to the SGX driver, any distro, not just Arago, using a TI SoC with SGX will need this fix, so it should go in meta-ti.
--- .../wayland/weston-ti-version.inc | 7 ++ ...equire-GL_EXT_unpack_subimage-commit.patch | 95 +++++++++++++++++++ .../wayland/weston_14.0.%.bbappend | 4 + 3 files changed, 106 insertions(+) create mode 100644 meta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc create mode 100644 meta-ti-bsp/recipes-graphics/wayland/weston/0001-Revert-require-GL_EXT_unpack_subimage-commit.patch create mode 100644 meta-ti-bsp/recipes-graphics/wayland/weston_14.0.%.bbappend
meta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc new file +7 -0
@@ -0,0 +1,7 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/weston:" + +PR:append = ".ti-soc1" + +SRC_URI += " \ + file://0001-Revert-require-GL_EXT_unpack_subimage-commit.patch \ +"
meta-ti-bsp/recipes-graphics/wayland/weston/0001-Revert-require-GL_EXT_unpack_subimage-commit.patch new file +95 -0
95 lines not on this page · raw message
meta-ti-bsp/recipes-graphics/wayland/weston_14.0.%.bbappend new file +4 -0
@@ -0,0 +1,4 @@ +WESTON_TI_VERSION = "" +WESTON_TI_VERSION:ti-soc = "${BPN}-ti-version.inc" + +require ${WESTON_TI_VERSION}
Signature · 1 line
2.39.2
Quoted 4 lines · Andrew Davis via lists.yoctoproject.org
This change is needed due to the SGX driver, any distro, not just Arago, using a TI SoC with SGX will need this fix, so it should go in meta-ti.
Signed-off-by Andrew Davis <[email protected]>
Quoted 135 lines
--- .../wayland/weston-ti-version.inc | 7 ++ ...equire-GL_EXT_unpack_subimage-commit.patch | 95 +++++++++++++++++++ .../wayland/weston_14.0.%.bbappend | 4 + 3 files changed, 106 insertions(+) create mode 100644 meta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc create mode 100644 meta-ti-bsp/recipes-graphics/wayland/weston/0001-Revert-require-GL_EXT_unpack_subimage-commit.patch create mode 100644 meta-ti-bsp/recipes-graphics/wayland/weston_14.0.%.bbappendmeta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc new file +7
-0@@ -0,0 +1,7 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/weston:" + +PR:append = ".ti-soc1" + +SRC_URI += " \ + file://0001-Revert-require-GL_EXT_unpack_subimage-commit.patch \ +"meta-ti-bsp/recipes-graphics/wayland/weston/0001-Revert-require-GL_EXT_unpack_subimage-commit.patch new file +95
-0@@ -0,0 +1,95 @@ +From 5a05e5b66dd3831a9c9c2b3f64bd42419d9ade2d Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko <[email protected]> +Date: Thu, 6 Jul 2023 01:48:41 +0000 +Subject: [PATCH] Revert require GL_EXT_unpack_subimage commit + +This reverts commit 593d5af43a8e2c2a3371088fa7ae430d0517c82d. + +That commit removed support for GPU drivers without GL_EXT_unpack_subimage +which SGX does not support. Add back support for GPUs without this +extension. + +Upstream-Status: Inappropriate [specific to TI SGX] + +Signed-off-by: Andrew Davis <[email protected]> +Signed-off-by: Denys Dmytriyenko <[email protected]> + +--- + 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 5032035..85616c9 100644 +--- a/libweston/renderer-gl/gl-renderer-internal.h ++++ b/libweston/renderer-gl/gl-renderer-internal.h +@@ -229,6 +229,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; +diff --git a/libweston/renderer-gl/gl-renderer.c b/libweston/renderer-gl/gl-renderer.c +index e694418b..2be6d621 100644 +--- a/libweston/renderer-gl/gl-renderer.c ++++ b/libweston/renderer-gl/gl-renderer.c +@@ -2523,6 +2523,7 @@ gl_renderer_flush_damage(struct weston_paint_node *pnode) + struct weston_surface *surface = pnode->surface; + const struct weston_testsuite_quirks *quirks = + &surface->compositor->test_data.test_quirks; ++ struct gl_renderer *gr = get_renderer(surface->compositor); + struct weston_buffer *buffer = surface->buffer_ref.buffer; + struct gl_surface_state *gs = get_surface_state(surface); + struct gl_buffer_state *gb = gs->buffer; +@@ -2550,6 +2551,24 @@ gl_renderer_flush_damage(struct weston_paint_node *pnode) + + data = wl_shm_buffer_get_data(buffer->shm_buffer); + ++ if (!gr->has_unpack_subimage) { ++ wl_shm_buffer_begin_access(buffer->shm_buffer); ++ for (j = 0; j < gs->buffer->num_textures; j++) { ++ glBindTexture(GL_TEXTURE_2D, gs->buffer->textures[j]); ++ glTexImage2D(GL_TEXTURE_2D, 0, ++ gs->buffer->gl_format[j], ++ gs->buffer->pitch / pixel_format_hsub(buffer->pixel_format, j), ++ buffer->height / pixel_format_vsub(buffer->pixel_format, j), ++ 0, ++ gl_format_from_internal(gs->buffer->gl_format[j]), ++ gs->buffer->gl_pixel_type, ++ data + gs->buffer->offset[j]); ++ } ++ wl_shm_buffer_end_access(buffer->shm_buffer); ++ ++ goto done; ++ } ++ + if (gb->needs_full_upload || quirks->gl_force_full_upload) { + wl_shm_buffer_begin_access(buffer->shm_buffer); + +@@ -4754,11 +4773,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"); +- return -1; +- } ++ 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")) +@@ -4880,6 +4897,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 "glReadPixels supports PBO: %s\n",meta-ti-bsp/recipes-graphics/wayland/weston_14.0.%.bbappend new file +4
-0@@ -0,0 +1,4 @@ +WESTON_TI_VERSION = "" +WESTON_TI_VERSION:ti-soc = "${BPN}-ti-version.inc" + +require ${WESTON_TI_VERSION}Signature · 1 line
2.39.2
Hey,
I would like to report following issue with this patch:
| DEBUG: Executing shell function BUILDSPEC | error: line 4: Illegal char '-' (0x2d) in: Release: r0.ti-soc1 | Building target platforms: aarch64-phytec-linux | Building for target aarch64-phytec-linux | WARNING: exit code 1 from a shell command. | DEBUG: Python function do_package_rpm finished | DEBUG: Python function do_package_write_rpm finished
Best regards,
Daniel
On 7/31/25 11:16, Andrew Davis via lists.yoctoproject.org wrote:
This change is needed due to the SGX driver, any distro, not just Arago, using a TI SoC with SGX will need this fix, so it should go in meta-ti.
--- .../wayland/weston-ti-version.inc | 7 ++ ...equire-GL_EXT_unpack_subimage-commit.patch | 95 +++++++++++++++++++ .../wayland/weston_14.0.%.bbappend | 4 + 3 files changed, 106 insertions(+) create mode 100644 meta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc create mode 100644 meta-ti-bsp/recipes-graphics/wayland/weston/0001-Revert-require-GL_EXT_unpack_subimage-commit.patch create mode 100644 meta-ti-bsp/recipes-graphics/wayland/weston_14.0.%.bbappend
meta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc new file +7 -0
@@ -0,0 +1,7 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/weston:" + +PR:append = ".ti-soc1" + +SRC_URI += " \ + file://0001-Revert-require-GL_EXT_unpack_subimage-commit.patch \ +"
meta-ti-bsp/recipes-graphics/wayland/weston/0001-Revert-require-GL_EXT_unpack_subimage-commit.patch new file +95 -0
95 lines not on this page · raw message
meta-ti-bsp/recipes-graphics/wayland/weston_14.0.%.bbappend new file +4 -0
@@ -0,0 +1,4 @@ +WESTON_TI_VERSION = "" +WESTON_TI_VERSION:ti-soc = "${BPN}-ti-version.inc" + +require ${WESTON_TI_VERSION}
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#18859): https://lists.yoctoproject.org/g/meta-ti/message/18859
Mute This Topic: https://lists.yoctoproject.org/mt/114471414/4454627
Group Owner: [email protected]<mailto:[email protected]>
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]<mailto:[email protected]>]
-=-=-=-=-=-=-=-=-=-=-=-
Quoted 6 lines · Daniel Schultz
Hey,
I would like to report following issue with this patch:
| DEBUG: Executing shell function BUILDSPEC | error: line 4: Illegal char '-' (
0x2d) in: Release: r0.ti-soc1 | Building target platforms: aarch64-phytec-linux | Building for target aarch64-phytec-linux | WARNING: exit code 1 from a shell command. | DEBUG: Python functiondo_package_rpmfinished | DEBUG: Python functiondo_package_write_rpmfinished
Thanks for the report, it seems that - is not allowed in RPM version/distro tags. "ti-soc1" might be better as "ti_soc1", or maybe that will mess with Debian..
How about just "tisoc1", any objections?
Andrew
Quoted 151 lines
Best regards,
DanielQuoted 146 lines · Andrew Davis via lists.yoctoproject.org
This change is needed due to the SGX driver, any distro, not just Arago, using a TI SoC with SGX will need this fix, so it should go in meta-ti.
Signed-off-by Andrew Davis<[email protected]>--- .../wayland/weston-ti-version.inc | 7 ++ ...equire-GL_EXT_unpack_subimage-commit.patch | 95 +++++++++++++++++++ .../wayland/weston_14.0.%.bbappend | 4 + 3 files changed, 106 insertions(+)create mode 100644 meta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc
create mode 100644meta-ti-bsp/recipes-graphics/wayland/weston/0001-Revert-require-GL_EXT_unpack_subimage-commit.patchcreate mode 100644 meta-ti-bsp/recipes-graphics/wayland/weston_14.0.%.bbappendmeta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc new file +7
-0@@ -0,0 +1,7 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/weston:" + +PR:append = ".ti-soc1" + +SRC_URI += " \ +file://0001-Revert-require-GL_EXT_unpack_subimage-commit.patch \ +"meta-ti-bsp/recipes-graphics/wayland/weston/0001-Revert-require-GL_EXT_unpack_subimage-commit.patch new file +95
-0@@ -0,0 +1,95 @@ +From 5a05e5b66dd3831a9c9c2b3f64bd42419d9ade2d Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko<[email protected]> +Date: Thu, 6 Jul 2023 01:48:41 +0000 +Subject: [PATCH] Revert require GL_EXT_unpack_subimage commit + +This reverts commit 593d5af43a8e2c2a3371088fa7ae430d0517c82d. + +That commit removed support for GPU drivers without GL_EXT_unpack_subimage +which SGX does not support. Add back support for GPUs without this +extension. + +Upstream-Status: Inappropriate [specific to TI SGX] + +Signed-off-by: Andrew Davis<[email protected]> +Signed-off-by: Denys Dmytriyenko<[email protected]> + +--- + 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 5032035..85616c9 100644 +--- a/libweston/renderer-gl/gl-renderer-internal.h ++++ b/libweston/renderer-gl/gl-renderer-internal.h +@@ -229,6 +229,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; +diff --git a/libweston/renderer-gl/gl-renderer.c b/libweston/renderer-gl/gl-renderer.c +index e694418b..2be6d621 100644 +--- a/libweston/renderer-gl/gl-renderer.c ++++ b/libweston/renderer-gl/gl-renderer.c +@@ -2523,6 +2523,7 @@ gl_renderer_flush_damage(struct weston_paint_node *pnode) + struct weston_surface *surface = pnode->surface; + const struct weston_testsuite_quirks *quirks = + &surface->compositor->test_data.test_quirks; ++ struct gl_renderer *gr = get_renderer(surface->compositor); + struct weston_buffer *buffer = surface->buffer_ref.buffer; + struct gl_surface_state *gs = get_surface_state(surface); + struct gl_buffer_state *gb = gs->buffer; +@@ -2550,6 +2551,24 @@ gl_renderer_flush_damage(struct weston_paint_node *pnode) + + data = wl_shm_buffer_get_data(buffer->shm_buffer); + ++ if (!gr->has_unpack_subimage) { ++ wl_shm_buffer_begin_access(buffer->shm_buffer); ++ for (j = 0; j < gs->buffer->num_textures; j++) { ++ glBindTexture(GL_TEXTURE_2D, gs->buffer->textures[j]); ++ glTexImage2D(GL_TEXTURE_2D, 0, ++ gs->buffer->gl_format[j], ++ gs->buffer->pitch / pixel_format_hsub(buffer->pixel_format, j), ++ buffer->height / pixel_format_vsub(buffer->pixel_format, j), ++ 0, ++ gl_format_from_internal(gs->buffer->gl_format[j]), ++ gs->buffer->gl_pixel_type, ++ data + gs->buffer->offset[j]); ++ } ++ wl_shm_buffer_end_access(buffer->shm_buffer); ++ ++ goto done; ++ } ++ + if (gb->needs_full_upload || quirks->gl_force_full_upload) { + wl_shm_buffer_begin_access(buffer->shm_buffer); + +@@ -4754,11 +4773,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"); +- return -1; +- } ++ 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")) +@@ -4880,6 +4897,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 "glReadPixels supports PBO: %s\n",meta-ti-bsp/recipes-graphics/wayland/weston_14.0.%.bbappend new file +4
-1@@ -0,0 +1,4 @@ +WESTON_TI_VERSION = "" +WESTON_TI_VERSION:ti-soc = "${BPN}-ti-version.inc" + +require ${WESTON_TI_VERSION} -=-=-=-=-=-=-=-=-=-=-=-Links: You receive all messages sent to this group.
View/Reply Online (#18859):https://lists.yoctoproject.org/g/meta-ti/message/18859 Mute This Topic:https://lists.yoctoproject.org/mt/114471414/4454627 Group Owner:[email protected] Unsubscribe:https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Quoted 13 lines · Andrew Davis
Quoted 11 lines · Daniel Schultz
Hey,
I would like to report following issue with this patch:
| DEBUG: Executing shell function BUILDSPEC | error: line 4: Illegal char '-' (0x2d) in: Release: r0.ti-soc1 | Building target platforms: aarch64-phytec-linux | Building for target aarch64-phytec-linux | WARNING: exit code 1 from a shell command. | DEBUG: Python function do_package_rpm finished | DEBUG: Python function do_package_write_rpmfinished
Quoted 7 lines
Thanks for the report, it seems that - is not allowed in RPM version/distro
tags. "ti-soc1" might be better as "ti_soc1", or maybe that will mess with
Debian..How about just "tisoc1", any objections?
tisoc1 sounds like safe solution. Especially if there are uncertainties about Debian.
- Daniel
Quoted 183 lines
Andrew
Quoted 179 lines
Best regards,
DanielQuoted 174 lines · Andrew Davis via lists.yoctoproject.org
This change is needed due to the SGX driver, any distro, not just Arago,
using a TI SoC with SGX will need this fix, so it should go in meta-ti.Signed-off-by Andrew Davis<[email protected]>---
.../wayland/weston-ti-version.inc | 7 ++ ...equire-GL_EXT_unpack_subimage-commit.patch | 95
+++++++++++++++++++
.../wayland/weston_14.0.%.bbappend | 4 +3 files changed, 106 insertions(+)create mode 100644
meta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc
create mode 100644meta-ti-bsp/recipes-graphics/wayland/weston/0001-Revert-require-GL_EXT_unpack_subimage-commit.patchcreate mode 100644
meta-ti-bsp/recipes-graphics/wayland/weston_14.0.%.bbappend(quoted diff) +0
-0a/meta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc b/meta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc new file mode 100644
index 00000000..fafef724meta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc new file +7
-0@@ -0,0 +1,7 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/weston:" + +PR:append = ".ti-soc1" + +SRC_URI += " \ +file://0001-Revert-require-GL_EXT_unpack_subimage-commit.patch \ +"(quoted diff) +0
-0
a/meta-ti-bsp/recipes-graphics/wayland/weston/0001-Revert-require-GL_EXT_unpack_subimage-commit.patchb/meta-ti-bsp/recipes-graphics/wayland/weston/0001-Revert-require-GL_EXT_unpack_subimage-commit.patchnew file mode 100644
index 00000000..fbe8f2bb
---/dev/null
+++b/meta-ti-bsp/recipes-graphics/wayland/weston/0001-Revert-require-GL_EXT_unpack_subimage-commit.patchmeta-ti-bsp/recipes-graphics/wayland/weston/0001-Revert-require-GL_EXT_unpack_subimage-commit.patch new file +8
-0@@ -0,0 +1,95 @@ +From 5a05e5b66dd3831a9c9c2b3f64bd42419d9ade2d Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko<[email protected]> +Date: Thu, 6 Jul 2023 01:48:41 +0000 +Subject: [PATCH] Revert require GL_EXT_unpack_subimage commit + +This reverts commit 593d5af43a8e2c2a3371088fa7ae430d0517c82d. + +That commit removed support for GPU drivers without
GL_EXT_unpack_subimagemeta-ti-bsp/recipes-graphics/wayland/weston/0001-Revert-require-GL_EXT_unpack_subimage-commit.patch new file +15
-0+which SGX does not support. Add back support for GPUs without this +extension. + +Upstream-Status: Inappropriate [specific to TI SGX] + +Signed-off-by: Andrew Davis<[email protected]> +Signed-off-by: Denys Dmytriyenko<[email protected]> + +--- + 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.hmeta-ti-bsp/recipes-graphics/wayland/weston/0001-Revert-require-GL_EXT_unpack_subimage-commit.patch new file +13
-0+index 5032035..85616c9 100644 +--- a/libweston/renderer-gl/gl-renderer-internal.h ++++ b/libweston/renderer-gl/gl-renderer-internal.h +@@ -229,6 +229,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; +diff --git a/libweston/renderer-gl/gl-renderer.c
b/libweston/renderer-gl/gl-renderer.c
+indexe694418b..2be6d621100644
+---a/libweston/renderer-gl/gl-renderer.c
++++b/libweston/renderer-gl/gl-renderer.c
+@@ -2523,6 +2523,7 @@gl_renderer_flush_damage(struct weston_paint_node *pnode)
+ structweston_surface*surface =pnode->surface;
+ const structweston_testsuite_quirks*quirks =
+&surface->compositor->test_data.test_quirks;
++ structgl_renderer*gr =get_renderer(surface->compositor); + structweston_buffer*buffer =surface->buffer_ref.buffer; + structgl_surface_state*gs =get_surface_state(surface); + structgl_buffer_state*gb =gs->buffer;
+@@ -2550,6 +2551,24 @@gl_renderer_flush_damage(struct weston_paint_node *pnode)meta-ti-bsp/recipes-graphics/wayland/weston/0001-Revert-require-GL_EXT_unpack_subimage-commit.patch new file +10
-0+ + data = wl_shm_buffer_get_data(buffer->shm_buffer); + ++ if (!gr->has_unpack_subimage) { ++ wl_shm_buffer_begin_access(buffer->shm_buffer); ++ for (j = 0; j < gs->buffer->num_textures; j++) { ++ glBindTexture(GL_TEXTURE_2D, gs->buffer->textures[j]); ++ glTexImage2D(GL_TEXTURE_2D, 0, ++ gs->buffer->gl_format[j], ++ gs->buffer->pitch /
pixel_format_hsub(buffer->pixel_format, j),
++buffer->height/pixel_format_vsub(buffer->pixel_format, j),
++ 0,
++gl_format_from_internal(gs->buffer->gl_format[j]), ++gs->buffer->gl_pixel_type,
++ data + gs->buffer->offset[j]); ++ }
++wl_shm_buffer_end_access(buffer->shm_buffer); ++
++ goto done;
++ }
++
+ if (gb->needs_full_upload||quirks->gl_force_full_upload) { +wl_shm_buffer_begin_access(buffer->shm_buffer);meta-ti-bsp/recipes-graphics/wayland/weston/0001-Revert-require-GL_EXT_unpack_subimage-commit.patch new file +7
-0+ +@@ -4754,11 +4773,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"); +- return -1; +- } ++ 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"))
+@@ -4880,6 +4897,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_shmsub-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 "glReadPixels supports PBO: %s\n",(quoted diff) +0
-0a/meta-ti-bsp/recipes-graphics/wayland/weston_14.0.%.bbappend b/meta-ti-bsp/recipes-graphics/wayland/weston_14.0.%.bbappend new file mode 100644
index 00000000..cf4f530ameta-ti-bsp/recipes-graphics/wayland/weston_14.0.%.bbappend new file +4
-1@@ -0,0 +1,4 @@ +WESTON_TI_VERSION = "" +WESTON_TI_VERSION:ti-soc = "${BPN}-ti-version.inc" + +require ${WESTON_TI_VERSION} -=-=-=-=-=-=-=-=-=-=-=-Links: You receive all messages sent to this group. View/Reply Online (#18859):https://lists.yoctoproject.org/g/meta-ti/message/18859 Mute This Topic:https://lists.yoctoproject.org/mt/114471414/4454627 Group Owner:[email protected] Unsubscribe:https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Ryan Eatmon
AppliedQuoted 20 lines · Daniel Schultz
Quoted 19 lines · Andrew Davis
Quoted 11 lines · Daniel Schultz
Hey,
I would like to report following issue with this patch:
| DEBUG: Executing shell function BUILDSPEC | error: line 4: Illegal char '-' (0x2d) in: Release: r0.ti-soc1 | Building target platforms: aarch64-phytec-linux | Building for target aarch64-phytec-linux | WARNING: exit code 1 from a shell command. | DEBUG: Python function do_package_rpm finished | DEBUG: Python function do_package_write_rpmfinished
Thanks for the report, it seems that - is not allowed in RPM version/distro
tags. "ti-soc1" might be better as "ti_soc1", or maybe that will mess with
Debian..
Quoted 4 lines
Quoted 1 line
How about just "tisoc1", any objections?
tisoc1 sounds like safe solution. Especially if there are uncertainties about Debian.
Merged to master.
Quoted 186 lines
- Daniel
Quoted 183 lines
Andrew
Quoted 179 lines
Best regards,
DanielQuoted 174 lines · Andrew Davis via lists.yoctoproject.org
This change is needed due to the SGX driver, any distro, not just Arago,
using a TI SoC with SGX will need this fix, so it should go in meta-ti.Signed-off-by Andrew Davis<[email protected]>--- .../wayland/weston-ti-version.inc | 7 ++ ...equire-GL_EXT_unpack_subimage-commit.patch | 95 +++++++++++++++++++ .../wayland/weston_14.0.%.bbappend | 4 + 3 files changed, 106 insertions(+)create mode 100644
meta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc
create mode 100644meta-ti-bsp/recipes-graphics/wayland/weston/0001-Revert-require-GL_EXT_unpack_subimage-commit.patch
create mode 100644
meta-ti-bsp/recipes-graphics/wayland/weston_14.0.%.bbappenddiff --git a/meta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc b/meta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc new file mode 100644
index 00000000..fafef724meta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc new file +7
-0@@ -0,0 +1,7 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/weston:" + +PR:append = ".ti-soc1" + +SRC_URI += " \ +file://0001-Revert-require-GL_EXT_unpack_subimage-commit.patch \ +"diff --git
a/meta-ti-bsp/recipes-graphics/wayland/weston/0001-Revert-require-GL_EXT_unpack_subimage-commit.patchb/meta-ti-bsp/recipes-graphics/wayland/weston/0001-Revert-require-GL_EXT_unpack_subimage-commit.patchnew file mode 100644
index 00000000..fbe8f2bb
---/dev/null
+++b/meta-ti-bsp/recipes-graphics/wayland/weston/0001-Revert-require-GL_EXT_unpack_subimage-commit.patchmeta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc new file +8
-0@@ -0,0 +1,95 @@ +From 5a05e5b66dd3831a9c9c2b3f64bd42419d9ade2d Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko<[email protected]> +Date: Thu, 6 Jul 2023 01:48:41 +0000 +Subject: [PATCH] Revert require GL_EXT_unpack_subimage commit + +This reverts commit 593d5af43a8e2c2a3371088fa7ae430d0517c82d. + +That commit removed support for GPU drivers without
GL_EXT_unpack_subimagemeta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc new file +15
-0+which SGX does not support. Add back support for GPUs without this +extension. + +Upstream-Status: Inappropriate [specific to TI SGX] + +Signed-off-by: Andrew Davis<[email protected]> +Signed-off-by: Denys Dmytriyenko<[email protected]> + +--- + 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.hmeta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc new file +13
-0+index 5032035..85616c9 100644 +--- a/libweston/renderer-gl/gl-renderer-internal.h ++++ b/libweston/renderer-gl/gl-renderer-internal.h +@@ -229,6 +229,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; +diff --git a/libweston/renderer-gl/gl-renderer.c
b/libweston/renderer-gl/gl-renderer.c
+indexe694418b..2be6d621100644
+---a/libweston/renderer-gl/gl-renderer.c
++++b/libweston/renderer-gl/gl-renderer.c
+@@ -2523,6 +2523,7 @@gl_renderer_flush_damage(struct weston_paint_node *pnode)
+ structweston_surface*surface =pnode->surface;
+ const structweston_testsuite_quirks*quirks =
+&surface->compositor->test_data.test_quirks;
++ structgl_renderer*gr =get_renderer(surface->compositor); + structweston_buffer*buffer =surface->buffer_ref.buffer; + structgl_surface_state*gs =get_surface_state(surface); + structgl_buffer_state*gb =gs->buffer;
+@@ -2550,6 +2551,24 @@gl_renderer_flush_damage(struct weston_paint_node *pnode)meta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc new file +10
-0+ + data = wl_shm_buffer_get_data(buffer->shm_buffer); + ++ if (!gr->has_unpack_subimage) { ++ wl_shm_buffer_begin_access(buffer->shm_buffer); ++ for (j = 0; j < gs->buffer->num_textures; j++) { ++ glBindTexture(GL_TEXTURE_2D, gs->buffer->textures[j]); ++ glTexImage2D(GL_TEXTURE_2D, 0, ++ gs->buffer->gl_format[j], ++ gs->buffer->pitch /
pixel_format_hsub(buffer->pixel_format, j),
++buffer->height/pixel_format_vsub(buffer->pixel_format, j),
++ 0,
++gl_format_from_internal(gs->buffer->gl_format[j]), ++gs->buffer->gl_pixel_type,
++ data + gs->buffer->offset[j]); ++ }
++wl_shm_buffer_end_access(buffer->shm_buffer); ++
++ goto done;
++ }
++
+ if (gb->needs_full_upload||quirks->gl_force_full_upload) { +wl_shm_buffer_begin_access(buffer->shm_buffer);meta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc new file +7
-0+ +@@ -4754,11 +4773,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"); +- return -1; +- } ++ 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"))
+@@ -4880,6 +4897,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_shmsub-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 "glReadPixels supports PBO: %s\n", diff --git a/meta-ti-bsp/recipes-graphics/wayland/weston_14.0.%.bbappend b/meta-ti-bsp/recipes-graphics/wayland/weston_14.0.%.bbappend new file mode 100644
index 00000000..cf4f530ameta-ti-bsp/recipes-graphics/wayland/weston_14.0.%.bbappend new file +4
-1@@ -0,0 +1,4 @@ +WESTON_TI_VERSION = "" +WESTON_TI_VERSION:ti-soc = "${BPN}-ti-version.inc" + +require ${WESTON_TI_VERSION} -=-=-=-=-=-=-=-=-=-=-=-Links: You receive all messages sent to this group. View/Reply Online (#18859):https://lists.yoctoproject.org/g/meta-ti/message/18859 Mute This Topic:https://lists.yoctoproject.org/mt/114471414/4454627 Group Owner:[email protected] Unsubscribe:https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Ryan Eatmon [email protected] ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS