vulkan: bumped to 1.4.311 (#12082)

This commit is contained in:
kenmays
2025-03-27 01:07:31 -07:00
committed by GitHub
parent 659a36dab9
commit fe153fd7f7
2 changed files with 13 additions and 13 deletions

View File

@@ -1,11 +1,11 @@
From fe9cd9279222d0468ec2fb7bd01a4e7be41efe22 Mon Sep 17 00:00:00 2001
From fd08167b613980b1157a15870f6647043565f15c 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 5882560..bd9427c 100644
index 062c1af..b46401c 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -88,6 +88,17 @@ struct activated_layer_info {
@@ -43,14 +43,14 @@ index 6489efa..c8f4096 100644
2.48.1
From a144391763f3211a7deb01ae0c29eea4a15a51c8 Mon Sep 17 00:00:00 2001
From 5a5654e8f7edce571d64df8e153e60df74a9888b 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 f85f774..634b33f 100644
index 82173ad..9765f19 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -108,7 +108,7 @@ elseif(APPLE)
@@ -66,7 +66,7 @@ index f85f774..634b33f 100644
add_library(loader_common_options INTERFACE)
target_link_libraries(loader_common_options INTERFACE platform_wsi)
+include_directories("/sources-2/Vulkan-Headers-1.4.310/include")
+include_directories("/sources-2/Vulkan-Headers-1.4.311/include")
# Enable beta Vulkan extensions
target_compile_definitions(loader_common_options INTERFACE VK_ENABLE_BETA_EXTENSIONS)
@@ -105,14 +105,14 @@ index 9a3b9c1..9104239 100644
2.48.1
From a368c1c2e30ce48c131e542f5f1f6db92708ec35 Mon Sep 17 00:00:00 2001
From 205083553a767c71ecdfc901bfb6a7499f9e79a3 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 bd9427c..c9e1d1d 100644
index b46401c..b166286 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -44,6 +44,11 @@
@@ -145,7 +145,7 @@ index bd9427c..c9e1d1d 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
@@ -3143,6 +3137,9 @@ VkResult read_data_files_in_search_paths(const struct loader_instance *inst, enu
@@ -3155,6 +3149,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 bd9427c..c9e1d1d 100644
#elif COMMON_UNIX_PLATFORMS
// Determine how much space is needed to generate the full search path
// for the current manifest files.
@@ -3281,6 +3278,15 @@ VkResult read_data_files_in_search_paths(const struct loader_instance *inst, enu
@@ -3293,6 +3290,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 bd9427c..c9e1d1d 100644
#elif COMMON_UNIX_PLATFORMS
}
@@ -3337,6 +3343,10 @@ VkResult read_data_files_in_search_paths(const struct loader_instance *inst, enu
@@ -3349,6 +3355,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 bd9427c..c9e1d1d 100644
#elif COMMON_UNIX_PLATFORMS
if (rel_size > 0) {
#if defined(__APPLE__)
@@ -3474,6 +3484,8 @@ out:
@@ -3486,6 +3496,8 @@ out:
loader_free_getenv(override_env, inst);
#if defined(_WIN32)
loader_instance_heap_free(inst, package_path);

View File

@@ -14,11 +14,11 @@ LICENSE="Apache v2"
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="e1bb7389feed5c2c5c729e3ef3cbd426346f46eb8dbed851e5d828f9cff7a0d2"
CHECKSUM_SHA256="bcebd281753384a2b019a633e6a81dca0e75414f0c8ec49f56edfcda8020ec20"
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="bfb970e74db66dc644c4f33ccef61cd69e057cda2950efc2f111c82c7ba98a6c"
CHECKSUM_SHA256_2="7989c360b870bcc2de52b9fd626fd2ba7a212fe177ade3aa3a10b2bcb61f8689"
SOURCE_DIR_2="Vulkan-Headers-$portVersion"
PATCHES="vulkan-$portVersion.patchset"