mirror of
git://git.yoctoproject.org/meta-freescale.git
synced 2025-10-22 23:02:20 +02:00
2a98f4e3ef
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 <max.krummenacher@toradex.com>
50 lines
1.8 KiB
Diff
50 lines
1.8 KiB
Diff
From 91aff12a127428ff558d57d93b91b0b909321c35 Mon Sep 17 00:00:00 2001
|
|
From: Yuan Tian <yuan.tian@nxp.com>
|
|
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 <yuan.tian@nxp.com>
|
|
---
|
|
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;
|