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_13.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_13.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_13.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_13.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_13.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 +@@ -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; +diff --git a/libweston/renderer-gl/gl-renderer.c b/libweston/renderer-gl/gl-renderer.c +index ccb41e6..38a0e0c 100644 +--- a/libweston/renderer-gl/gl-renderer.c ++++ b/libweston/renderer-gl/gl-renderer.c +@@ -2106,6 +2106,7 @@ gl_renderer_flush_damage(struct weston_surface *surface, + { + 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_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++) { ++ 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) { + 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"); +- 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")) +@@ -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",meta-ti-bsp/recipes-graphics/wayland/weston_13.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 7 lines · Denys Dmytriyenko
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]>
Though, you would need to submit a separate patch for master, as there was a fuzz-related update since scarthgap:
https://git.yoctoproject.org/meta-arago/commit/?id=39136769521719157dde1e13559ce5f75b9be52a
Quoted 135 lines
Quoted 135 lines
--- .../wayland/weston-ti-version.inc | 7 ++ ...equire-GL_EXT_unpack_subimage-commit.patch | 95 +++++++++++++++++++ .../wayland/weston_13.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_13.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 +@@ -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; +diff --git a/libweston/renderer-gl/gl-renderer.c b/libweston/renderer-gl/gl-renderer.c +index ccb41e6..38a0e0c 100644 +--- a/libweston/renderer-gl/gl-renderer.c ++++ b/libweston/renderer-gl/gl-renderer.c +@@ -2106,6 +2106,7 @@ gl_renderer_flush_damage(struct weston_surface *surface, + { + 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_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++) { ++ 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) { + 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"); +- 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")) +@@ -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",meta-ti-bsp/recipes-graphics/wayland/weston_13.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
As with the patch from meta-arago... NAK.
weston has moved to 14.0 in master.
Please submit the proper patch for master on both meta-arago and meta-ti.
Quoted 137 lines · Andrew Davis
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_13.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_13.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 +@@ -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; +diff --git a/libweston/renderer-gl/gl-renderer.c b/libweston/renderer-gl/gl-renderer.c +index ccb41e6..38a0e0c 100644 +--- a/libweston/renderer-gl/gl-renderer.c ++++ b/libweston/renderer-gl/gl-renderer.c +@@ -2106,6 +2106,7 @@ gl_renderer_flush_damage(struct weston_surface *surface, + { + 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_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++) { ++ 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) { + 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"); +- 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")) +@@ -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",meta-ti-bsp/recipes-graphics/wayland/weston_13.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 · 3 lines
Ryan Eatmon [email protected] ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS
Quoted 8 lines · Ryan Eatmon
As with the patch from meta-arago... NAK.
weston has moved to 14.0 in master.
Please submit the proper patch for master on both meta-arago and meta-ti.
Just noticed that, I'll send a version for master. This version (and the one for meta-arago) does apply on scarthgap if you want to just take this as the scarthgap-only version.
Andrew
Quoted 141 lines · Andrew Davis
Quoted 137 lines
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_13.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_13.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 +@@ -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; +diff --git a/libweston/renderer-gl/gl-renderer.c b/libweston/renderer-gl/gl-renderer.c +index ccb41e6..38a0e0c 100644 +--- a/libweston/renderer-gl/gl-renderer.c ++++ b/libweston/renderer-gl/gl-renderer.c +@@ -2106,6 +2106,7 @@ gl_renderer_flush_damage(struct weston_surface *surface, + { + 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_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++) { ++ 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) { + 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"); +- 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")) +@@ -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",meta-ti-bsp/recipes-graphics/wayland/weston_13.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}
Quoted 6 lines · Andrew Davis
Quoted 5 lines · Ryan Eatmon
As with the patch from meta-arago... NAK.
weston has moved to 14.0 in master.
Quoted 7 lines
Quoted 3 lines
Please submit the proper patch for master on both meta-arago and meta-ti.
Just noticed that, I'll send a version for master. This version (and the one for meta-arago) does apply on scarthgap if you want to just take this as the scarthgap-only version.
That was my plan.
Quoted 159 lines
Andrew
Quoted 156 lines · Andrew Davis
Quoted 152 lines
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_13.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_13.0.%.bbappendmeta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc new file +6
-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
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 +14
-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 +@@ -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; +diff --git a/libweston/renderer-gl/gl-renderer.c
b/libweston/renderer-gl/gl-renderer.c
+index ccb41e6..38a0e0c 100644
+---a/libweston/renderer-gl/gl-renderer.c
++++b/libweston/renderer-gl/gl-renderer.c
+@@ -2106,6 +2106,7 @@ gl_renderer_flush_damage(structweston_surface*surface,
+ {
+ const structweston_testsuite_quirks*quirks =
+&surface->compositor->test_data.test_quirks;
++ structgl_renderer*gr =get_renderer(surface->compositor); + structgl_surface_state*gs =get_surface_state(surface); + structgl_buffer_state*gb =gs->buffer;
+ structweston_paint_node*pnode;
+@@ -2152,6 +2153,24 @@ gl_renderer_flush_damage(structweston_surface*surface,meta-ti-bsp/recipes-graphics/wayland/weston/0001-Revert-require-GL_EXT_unpack_subimage-commit.patch new file +10
-0+ + 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++) { ++ 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) { +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"); +- 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"))
+@@ -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_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 "wl_shm10 bpc formats: %s\n",meta-ti-bsp/recipes-graphics/wayland/weston_13.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 · 3 lines
Ryan Eatmon [email protected] ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS