From 2a98f4e3ef23722c76c51537add25e98c6ee6e1b Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 14 Oct 2025 16:43:44 +0200 Subject: vulkan-loader: follow oe-core version bump The patch still applies cleanly. Follow the version bump, otherwise - vulkan-loader_1.4.321.0.bbappend doesn't have a matching recipe - vulkan-loader_%.bbappend adds the patch, however it is nowhere found Both points results in meta data parsing errors. Signed-off-by: Max Krummenacher --- ...69-change-mali-wsi-layer-activating-order.patch | 49 ---------------------- ...69-change-mali-wsi-layer-activating-order.patch | 49 ++++++++++++++++++++++ .../vulkan/vulkan-loader_1.4.321.0.bbappend | 1 - .../vulkan/vulkan-loader_1.4.328.1.bbappend | 1 + 4 files changed, 50 insertions(+), 50 deletions(-) delete mode 100644 recipes-graphics/vulkan/vulkan-loader-1.4.321.0/0001-LF-11869-change-mali-wsi-layer-activating-order.patch create mode 100644 recipes-graphics/vulkan/vulkan-loader-1.4.328.1/0001-LF-11869-change-mali-wsi-layer-activating-order.patch delete mode 100644 recipes-graphics/vulkan/vulkan-loader_1.4.321.0.bbappend create mode 100644 recipes-graphics/vulkan/vulkan-loader_1.4.328.1.bbappend (limited to 'recipes-graphics') diff --git a/recipes-graphics/vulkan/vulkan-loader-1.4.321.0/0001-LF-11869-change-mali-wsi-layer-activating-order.patch b/recipes-graphics/vulkan/vulkan-loader-1.4.321.0/0001-LF-11869-change-mali-wsi-layer-activating-order.patch deleted file mode 100644 index f54919cd9..000000000 --- a/recipes-graphics/vulkan/vulkan-loader-1.4.321.0/0001-LF-11869-change-mali-wsi-layer-activating-order.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 91aff12a127428ff558d57d93b91b0b909321c35 Mon Sep 17 00:00:00 2001 -From: Yuan Tian -Date: Sat, 27 Apr 2024 06:06:54 +0800 -Subject: [PATCH] LF-11869 change mali wsi layer activating order - -Upstream-Status: Inappropriate [i.MX specific] - -Signed-off-by: Yuan Tian ---- - loader/loader.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/loader/loader.c b/loader/loader.c -index 9064cd633..5b00870a4 100644 ---- a/loader/loader.c -+++ b/loader/loader.c -@@ -3034,6 +3034,7 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s - #if !defined(_WIN32) - char temp_path[2048]; - #endif -+ bool has_wsi_layer = false; - - // Now, parse the paths - char *next_file = search_path; -@@ -3100,6 +3101,10 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s - name = full_path; - - VkResult local_res; -+ if(!strcmp(name,"/etc/vulkan/implicit_layer.d/VkLayer_window_system_integration.json")) { -+ has_wsi_layer = true; -+ continue; -+ } - local_res = add_if_manifest_file(inst, name, out_files); - - // Incomplete means this was not a valid data file. -@@ -3110,6 +3115,13 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s - break; - } - } -+ -+ if(has_wsi_layer) { -+ name = "/etc/vulkan/implicit_layer.d/VkLayer_window_system_integration.json"; -+ vk_result = add_if_manifest_file(inst, name, out_files); -+ has_wsi_layer = false; -+ } -+ - loader_closedir(inst, dir_stream); - if (vk_result != VK_SUCCESS) { - goto out; diff --git a/recipes-graphics/vulkan/vulkan-loader-1.4.328.1/0001-LF-11869-change-mali-wsi-layer-activating-order.patch b/recipes-graphics/vulkan/vulkan-loader-1.4.328.1/0001-LF-11869-change-mali-wsi-layer-activating-order.patch new file mode 100644 index 000000000..f54919cd9 --- /dev/null +++ b/recipes-graphics/vulkan/vulkan-loader-1.4.328.1/0001-LF-11869-change-mali-wsi-layer-activating-order.patch @@ -0,0 +1,49 @@ +From 91aff12a127428ff558d57d93b91b0b909321c35 Mon Sep 17 00:00:00 2001 +From: Yuan Tian +Date: Sat, 27 Apr 2024 06:06:54 +0800 +Subject: [PATCH] LF-11869 change mali wsi layer activating order + +Upstream-Status: Inappropriate [i.MX specific] + +Signed-off-by: Yuan Tian +--- + loader/loader.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/loader/loader.c b/loader/loader.c +index 9064cd633..5b00870a4 100644 +--- a/loader/loader.c ++++ b/loader/loader.c +@@ -3034,6 +3034,7 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s + #if !defined(_WIN32) + char temp_path[2048]; + #endif ++ bool has_wsi_layer = false; + + // Now, parse the paths + char *next_file = search_path; +@@ -3100,6 +3101,10 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s + name = full_path; + + VkResult local_res; ++ if(!strcmp(name,"/etc/vulkan/implicit_layer.d/VkLayer_window_system_integration.json")) { ++ has_wsi_layer = true; ++ continue; ++ } + local_res = add_if_manifest_file(inst, name, out_files); + + // Incomplete means this was not a valid data file. +@@ -3110,6 +3115,13 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s + break; + } + } ++ ++ if(has_wsi_layer) { ++ name = "/etc/vulkan/implicit_layer.d/VkLayer_window_system_integration.json"; ++ vk_result = add_if_manifest_file(inst, name, out_files); ++ has_wsi_layer = false; ++ } ++ + loader_closedir(inst, dir_stream); + if (vk_result != VK_SUCCESS) { + goto out; diff --git a/recipes-graphics/vulkan/vulkan-loader_1.4.321.0.bbappend b/recipes-graphics/vulkan/vulkan-loader_1.4.321.0.bbappend deleted file mode 100644 index 8d8d974d4..000000000 --- a/recipes-graphics/vulkan/vulkan-loader_1.4.321.0.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS:prepend:imx-nxp-bsp := "${THISDIR}/vulkan-loader-1.4.321.0:" diff --git a/recipes-graphics/vulkan/vulkan-loader_1.4.328.1.bbappend b/recipes-graphics/vulkan/vulkan-loader_1.4.328.1.bbappend new file mode 100644 index 000000000..93f780c9c --- /dev/null +++ b/recipes-graphics/vulkan/vulkan-loader_1.4.328.1.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS:prepend:imx-nxp-bsp := "${THISDIR}/vulkan-loader-1.4.328.1:" -- cgit v1.2.3-54-g00ecf