weston: Disabling GL_EXT_unpack_subimage

Disabling GL_EXT_unpack_subimage as it is not supported by GLES2.0

Signed-off-by: Parth Gajjar <parth.gajjar@amd.com>

Reworked recipe SRC_URI to only apply to libmali case

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

2 files changed, 38 insertions, 1 deletions

diff --git a/meta-xilinx-core/recipes-graphics/wayland/files/0001-libweston-GL_EXT_unpack_subimage-not-supported-for-G.patch b/meta-xilinx-core/recipes-graphics/wayland/files/0001-libweston-GL_EXT_unpack_subimage-not-supported-for-G.patch
new file mode 100644
index 00000000..e2e7dd95
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/wayland/files/0001-libweston-GL_EXT_unpack_subimage-not-supported-for-G.patch
@@ -0,0 +1,33 @@
+From 354bbf9657385519dceeff6a890a71f9d53e6a8f Mon Sep 17 00:00:00 2001
+From: Parth Gajjar <parth.gajjar@amd.com>
+Date: Tue, 17 Jan 2023 02:04:32 -0800
+Subject: [PATCH] libweston: GL_EXT_unpack_subimage not supported for GLES2.0
+
+Removing GL_EXT_unpack_subimage as not supported by GLES2.0
+
+Signed-off-by: Parth Gajjar <parth.gajjar@amd.com>
+---
+ libweston/renderer-gl/gl-renderer.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libweston/renderer-gl/gl-renderer.c b/libweston/renderer-gl/gl-renderer.c
+index 613ddf4..046a26f 100644
+--- a/libweston/renderer-gl/gl-renderer.c
++++ b/libweston/renderer-gl/gl-renderer.c
+@@ -3941,11 +3941,13 @@ gl_renderer_setup(struct weston_compositor *ec, EGLSurface egl_surface)
+        else
+                ec->read_format = PIXMAN_a8b8g8r8;
+ 
++#if 0
+        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;
+        }
++#endif
+ 
+        if (gr->gl_version >= gr_gl_version(3, 0) ||
+            weston_check_egl_extension(extensions, "GL_EXT_texture_type_2_10_10_10_REV"))
+-- 
+2.34.1
+
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston_%.bbappend b/meta-xilinx-core/recipes-graphics/wayland/weston_%.bbappend
index 33bed127..bb6413a8 100644
--- a/meta-xilinx-core/recipes-graphics/wayland/weston_%.bbappend
+++ b/meta-xilinx-core/recipes-graphics/wayland/weston_%.bbappend
@@ -10,7 +10,11 @@ PACKAGE_ARCH = "${DEFAULT_PACKAGE_ARCH}"
 
 
 # mali400 specific items
-MALI_SRC_URI = "${@bb.utils.contains('DISTRO_FEATURES', 'libmali', 'file://0002-libmali-does-not-support-gles3.patch', '', d)}"
+LIBMALI_SRC_URI = " \
+    file://0001-libweston-GL_EXT_unpack_subimage-not-supported-for-G.patch \
+    file://0002-libmali-does-not-support-gles3.patch \
+"
+MALI_SRC_URI = "${@bb.utils.contains('DISTRO_FEATURES', 'libmali', '${LIBMALI_SRC_URI}', '', d)}"
 SRC_URI:append = "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', ' ${MALI_SRC_URI}', '', d)}"
 
 # Skip dmabuf-feedback, as it requires gbm >= 21.1.1, mali-xlnx only provides 17.3