Vulkan: bumped to 1.4.310 (#11886)

This commit is contained in:
kenmays
2025-03-09 09:07:09 -07:00
committed by GitHub
parent 28da1c0c40
commit dab7aa8b29
2 changed files with 18 additions and 18 deletions

View File

@@ -1,11 +1,11 @@
From 9b28042ada6c0c6ab466c16bd7564035bf82bb3c Mon Sep 17 00:00:00 2001
From fe9cd9279222d0468ec2fb7bd01a4e7be41efe22 Mon Sep 17 00:00:00 2001
From: X512 <danger_mail@list.ru>
Date: Sun, 9 Jan 2022 06:34:23 +0900
Subject: basic fixes for haiku
diff --git a/loader/loader.c b/loader/loader.c
index 9deff68..b70e3fc 100644
index 5882560..bd9427c 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -88,6 +88,17 @@ struct activated_layer_info {
@@ -27,7 +27,7 @@ index 9deff68..b70e3fc 100644
// all entrypoints on the instance chain need to be locked except GPA
// additionally CreateDevice and DestroyDevice needs to be locked
diff --git a/loader/loader_environment.c b/loader/loader_environment.c
index 4f9133e..39e70bd 100644
index 6489efa..c8f4096 100644
--- a/loader/loader_environment.c
+++ b/loader/loader_environment.c
@@ -49,7 +49,7 @@ char *loader_getenv(const char *name, const struct loader_instance *inst) {
@@ -40,17 +40,17 @@ index 4f9133e..39e70bd 100644
// The main difference between secure getenv and getenv is that secure getenv
// returns NULL if the process is being run with elevated privileges by a normal user.
--
2.45.2
2.48.1
From 25e004b4b8b73f6ce73628b6c6bc03c12ef69782 Mon Sep 17 00:00:00 2001
From a144391763f3211a7deb01ae0c29eea4a15a51c8 Mon Sep 17 00:00:00 2001
From: Ken Mays <kmays2000@gmail.com>
Date: Fri, 6 Sep 2024 05:26:34 +0000
Subject: Improve port for Haiku
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9e000f..0db72d7 100644
index f85f774..634b33f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -108,7 +108,7 @@ elseif(APPLE)
@@ -66,7 +66,7 @@ index c9e000f..0db72d7 100644
add_library(loader_common_options INTERFACE)
target_link_libraries(loader_common_options INTERFACE platform_wsi)
+include_directories("/sources-2/Vulkan-Headers-1.4.305/include")
+include_directories("/sources-2/Vulkan-Headers-1.4.310/include")
# Enable beta Vulkan extensions
target_compile_definitions(loader_common_options INTERFACE VK_ENABLE_BETA_EXTENSIONS)
@@ -102,17 +102,17 @@ index 9a3b9c1..9104239 100644
#elif defined(__QNX__)
--
2.45.2
2.48.1
From e870ea7eb8c197da32e13d44081c1e5dfd52530a Mon Sep 17 00:00:00 2001
From a368c1c2e30ce48c131e542f5f1f6db92708ec35 Mon Sep 17 00:00:00 2001
From: X512 <danger_mail@list.ru>
Date: Sun, 9 Mar 2025 19:11:24 +0900
Subject: haiku: use FindDirectory
diff --git a/loader/loader.c b/loader/loader.c
index b70e3fc..36146e0 100644
index bd9427c..c9e1d1d 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -44,6 +44,11 @@
@@ -145,7 +145,7 @@ index b70e3fc..36146e0 100644
// thread safety lock for accessing global data structures such as "loader"
// all entrypoints on the instance chain need to be locked except GPA
// additionally CreateDevice and DestroyDevice needs to be locked
@@ -3139,6 +3133,9 @@ VkResult read_data_files_in_search_paths(const struct loader_instance *inst, enu
@@ -3143,6 +3137,9 @@ VkResult read_data_files_in_search_paths(const struct loader_instance *inst, enu
#if defined(_WIN32)
char *package_path = NULL;
@@ -155,7 +155,7 @@ index b70e3fc..36146e0 100644
#elif COMMON_UNIX_PLATFORMS
// Determine how much space is needed to generate the full search path
// for the current manifest files.
@@ -3277,6 +3274,15 @@ VkResult read_data_files_in_search_paths(const struct loader_instance *inst, enu
@@ -3281,6 +3278,15 @@ VkResult read_data_files_in_search_paths(const struct loader_instance *inst, enu
if (search_path_size == 2) {
goto out;
}
@@ -171,7 +171,7 @@ index b70e3fc..36146e0 100644
#elif COMMON_UNIX_PLATFORMS
}
@@ -3333,6 +3339,10 @@ VkResult read_data_files_in_search_paths(const struct loader_instance *inst, enu
@@ -3337,6 +3343,10 @@ VkResult read_data_files_in_search_paths(const struct loader_instance *inst, enu
if (NULL != package_path) {
copy_data_file_info(package_path, NULL, 0, &cur_path_ptr);
}
@@ -182,7 +182,7 @@ index b70e3fc..36146e0 100644
#elif COMMON_UNIX_PLATFORMS
if (rel_size > 0) {
#if defined(__APPLE__)
@@ -3470,6 +3480,8 @@ out:
@@ -3474,6 +3484,8 @@ out:
loader_free_getenv(override_env, inst);
#if defined(_WIN32)
loader_instance_heap_free(inst, package_path);
@@ -192,5 +192,5 @@ index b70e3fc..36146e0 100644
loader_free_getenv(xdg_config_home, inst);
loader_free_getenv(xdg_config_dirs, inst);
--
2.45.2
2.48.1

View File

@@ -11,14 +11,14 @@ layers, between an application and the drivers."
HOMEPAGE="https://www.vulkan.org/"
COPYRIGHT="2014-2025 The Khronos Group Inc."
LICENSE="Apache v2"
REVISION="2"
REVISION="1"
SOURCE_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/refs/tags/v$portVersion.tar.gz"
SOURCE_FILENAME="Vulkan-Loader-$portVersion.tar.gz"
CHECKSUM_SHA256="1f2992538ee6a9d7ff3e00fdc8dc0c3a03a6235ebb2a1b7ee2179a13bc1c5c06"
CHECKSUM_SHA256="e1bb7389feed5c2c5c729e3ef3cbd426346f46eb8dbed851e5d828f9cff7a0d2"
SOURCE_DIR="Vulkan-Loader-$portVersion"
SOURCE_URI_2="https://github.com/KhronosGroup/Vulkan-Headers/archive/refs/tags/v$portVersion.tar.gz"
SOURCE_FILENAME_2="Vulkan-Headers-$portVersion.tar.gz"
CHECKSUM_SHA256_2="7581c5ed0337ffeef0707651561f722700081bc69c62c582c470cd77c2be0920"
CHECKSUM_SHA256_2="bfb970e74db66dc644c4f33ccef61cd69e057cda2950efc2f111c82c7ba98a6c"
SOURCE_DIR_2="Vulkan-Headers-$portVersion"
PATCHES="vulkan-$portVersion.patchset"