From 90b97d032346466b1514e05caf9e7b607d721424 Mon Sep 17 00:00:00 2001 From: thfr Date: Sun, 30 Oct 2022 22:51:56 +0000 Subject: [PATCH] update vulkan ports to SDK 1.3.224.1 (and glslang to 11.11.0) tested also by jsg@ on arm64 and amd64 with no issues with latest Mesa. --- graphics/glslang/Makefile | 2 +- graphics/glslang/distinfo | 4 +- graphics/glslang/pkg/PLIST | 14 ++-- graphics/spirv-headers/Makefile | 2 +- graphics/spirv-headers/distinfo | 4 +- graphics/spirv-headers/pkg/PLIST | 1 + graphics/spirv-tools/Makefile | 2 +- graphics/spirv-tools/distinfo | 4 +- graphics/spirv-tools/pkg/PLIST | 5 ++ graphics/vulkan-headers/Makefile | 2 +- graphics/vulkan-headers/distinfo | 4 +- .../patches/patch-registry_apiconventions_py | 9 +++ .../patches/patch-registry_conventions_py | 9 --- .../patch-registry_spec_tools_conventions_py | 9 +++ graphics/vulkan-headers/pkg/PLIST | 5 +- graphics/vulkan-loader/Makefile | 2 +- graphics/vulkan-loader/distinfo | 4 +- .../patches/patch-CMakeLists_txt | 26 ++++---- .../patches/patch-loader_CMakeLists_txt | 31 --------- .../patches/patch-loader_allocation_h | 15 ----- .../patches/patch-loader_get_environment_c | 11 +--- .../patches/patch-loader_stack_allocation_h | 20 ++++++ ...tch-loader_unknown_ext_chain_gas_aarch64_S | 16 ----- .../patches/patch-loader_vk_loader_platform_h | 65 ++++++++++--------- graphics/vulkan-tools/Makefile | 2 +- graphics/vulkan-tools/distinfo | 4 +- .../vulkan-tools/patches/patch-cube_cube_cpp | 4 +- .../patches/patch-vulkaninfo_vulkaninfo_h | 15 ++--- graphics/vulkan-validation-layers/Makefile | 2 +- graphics/vulkan-validation-layers/distinfo | 4 +- .../patches/patch-CMakeLists_txt | 4 +- .../patch-layers_best_practices_utils_cpp | 16 ----- .../patches/patch-layers_vk_mem_alloc_h | 8 +-- 33 files changed, 135 insertions(+), 190 deletions(-) create mode 100644 graphics/vulkan-headers/patches/patch-registry_apiconventions_py delete mode 100644 graphics/vulkan-headers/patches/patch-registry_conventions_py create mode 100644 graphics/vulkan-headers/patches/patch-registry_spec_tools_conventions_py delete mode 100644 graphics/vulkan-loader/patches/patch-loader_CMakeLists_txt delete mode 100644 graphics/vulkan-loader/patches/patch-loader_allocation_h create mode 100644 graphics/vulkan-loader/patches/patch-loader_stack_allocation_h delete mode 100644 graphics/vulkan-loader/patches/patch-loader_unknown_ext_chain_gas_aarch64_S delete mode 100644 graphics/vulkan-validation-layers/patches/patch-layers_best_practices_utils_cpp diff --git a/graphics/glslang/Makefile b/graphics/glslang/Makefile index cb88e369e58..370a11daffd 100644 --- a/graphics/glslang/Makefile +++ b/graphics/glslang/Makefile @@ -2,7 +2,7 @@ PORTROACH = limit:^[0-9] COMMENT = reference front-end for GLSL and ESSL -GH_TAGNAME = 11.7.0 +GH_TAGNAME = 11.11.0 GH_ACCOUNT = KhronosGroup GH_PROJECT = glslang diff --git a/graphics/glslang/distinfo b/graphics/glslang/distinfo index 8ba2576a4dd..97f13f8fe71 100644 --- a/graphics/glslang/distinfo +++ b/graphics/glslang/distinfo @@ -1,2 +1,2 @@ -SHA256 (glslang-11.7.0.tar.gz) = tsg4ZMNgZnjRFnURT6XzWMUZ/h2tmngYArzIf7j6MtU= -SIZE (glslang-11.7.0.tar.gz) = 3426327 +SHA256 (glslang-11.11.0.tar.gz) = JsIWwwYlEsAYy911IiS42tcDt+W7kL8zi6LbtdTxFDg= +SIZE (glslang-11.11.0.tar.gz) = 3542123 diff --git a/graphics/glslang/pkg/PLIST b/graphics/glslang/pkg/PLIST index 6155a3cbcc5..b2fd7df25b8 100644 --- a/graphics/glslang/pkg/PLIST +++ b/graphics/glslang/pkg/PLIST @@ -67,23 +67,14 @@ include/glslang/SPIRV/spirv.hpp include/glslang/SPIRV/spvIR.h include/glslang/build_info.h lib/cmake/ -lib/cmake/HLSLTargets${MODCMAKE_BUILD_SUFFIX} lib/cmake/HLSLTargets.cmake -lib/cmake/OGLCompilerTargets${MODCMAKE_BUILD_SUFFIX} lib/cmake/OGLCompilerTargets.cmake -lib/cmake/OSDependentTargets${MODCMAKE_BUILD_SUFFIX} lib/cmake/OSDependentTargets.cmake -lib/cmake/SPIRVTargets${MODCMAKE_BUILD_SUFFIX} lib/cmake/SPIRVTargets.cmake -lib/cmake/SPVRemapperTargets${MODCMAKE_BUILD_SUFFIX} lib/cmake/SPVRemapperTargets.cmake -lib/cmake/glslang-default-resource-limitsTargets${MODCMAKE_BUILD_SUFFIX} lib/cmake/glslang-default-resource-limitsTargets.cmake -lib/cmake/glslangTargets${MODCMAKE_BUILD_SUFFIX} lib/cmake/glslangTargets.cmake -lib/cmake/glslangValidatorTargets${MODCMAKE_BUILD_SUFFIX} lib/cmake/glslangValidatorTargets.cmake -lib/cmake/spirv-remapTargets${MODCMAKE_BUILD_SUFFIX} lib/cmake/spirv-remapTargets.cmake @static-lib lib/libGenericCodeGen.a @static-lib lib/libHLSL.a @@ -94,3 +85,8 @@ lib/cmake/spirv-remapTargets.cmake @static-lib lib/libSPVRemapper.a @static-lib lib/libglslang-default-resource-limits.a @static-lib lib/libglslang.a +share/glslang/ +share/glslang/glslang-config-version.cmake +share/glslang/glslang-config.cmake +share/glslang/glslang-targets${MODCMAKE_BUILD_SUFFIX} +share/glslang/glslang-targets.cmake diff --git a/graphics/spirv-headers/Makefile b/graphics/spirv-headers/Makefile index 464636c1bca..3e6eb16197a 100644 --- a/graphics/spirv-headers/Makefile +++ b/graphics/spirv-headers/Makefile @@ -1,6 +1,6 @@ COMMENT = SPIRV-Headers -V = 1.3.204.1 +V = 1.3.224.1 DISTNAME = spirv-headers-${V} GH_ACCOUNT = KhronosGroup GH_PROJECT = SPIRV-Headers diff --git a/graphics/spirv-headers/distinfo b/graphics/spirv-headers/distinfo index 4296d319cec..3457f4710bf 100644 --- a/graphics/spirv-headers/distinfo +++ b/graphics/spirv-headers/distinfo @@ -1,2 +1,2 @@ -SHA256 (spirv-headers-1.3.204.1.tar.gz) = JihkBTlowhfUWyS4kESnc2oyNhiUdD3Wz+eI3yWMdGw= -SIZE (spirv-headers-1.3.204.1.tar.gz) = 417550 +SHA256 (spirv-headers-1.3.224.1.tar.gz) = yFcUv+YvhAByhr07PARxrwp+BqtmvCykYjBDARsoc38= +SIZE (spirv-headers-1.3.224.1.tar.gz) = 437010 diff --git a/graphics/spirv-headers/pkg/PLIST b/graphics/spirv-headers/pkg/PLIST index 22cb0046dfc..367b26f8a6c 100644 --- a/graphics/spirv-headers/pkg/PLIST +++ b/graphics/spirv-headers/pkg/PLIST @@ -62,6 +62,7 @@ include/spirv/unified1/extinst.spv-amd-gcn-shader.grammar.json include/spirv/unified1/extinst.spv-amd-shader-ballot.grammar.json include/spirv/unified1/extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json include/spirv/unified1/extinst.spv-amd-shader-trinary-minmax.grammar.json +include/spirv/unified1/spirv.bf include/spirv/unified1/spirv.core.grammar.json include/spirv/unified1/spirv.cs include/spirv/unified1/spirv.h diff --git a/graphics/spirv-tools/Makefile b/graphics/spirv-tools/Makefile index 05f51393472..d6df29e1779 100644 --- a/graphics/spirv-tools/Makefile +++ b/graphics/spirv-tools/Makefile @@ -1,6 +1,6 @@ COMMENT = API and commands for processing SPIR-V -V = 1.3.204.1 +V = 1.3.224.1 DISTNAME = spirv-tools-${V} GH_ACCOUNT = KhronosGroup GH_PROJECT = SPIRV-Tools diff --git a/graphics/spirv-tools/distinfo b/graphics/spirv-tools/distinfo index 372bab4f4f2..22ead82dd4c 100644 --- a/graphics/spirv-tools/distinfo +++ b/graphics/spirv-tools/distinfo @@ -1,2 +1,2 @@ -SHA256 (spirv-tools-1.3.204.1.tar.gz) = bhmQDpSJRCQwJK7dCiAbrzhUs3e5zHo4ZVO8EDsIczU= -SIZE (spirv-tools-1.3.204.1.tar.gz) = 2905629 +SHA256 (spirv-tools-1.3.224.1.tar.gz) = yteOVCvy+lnjMBnngN+Obftan0Qgo/ziO0wWKiET4W4= +SIZE (spirv-tools-1.3.224.1.tar.gz) = 3033574 diff --git a/graphics/spirv-tools/pkg/PLIST b/graphics/spirv-tools/pkg/PLIST index a3b6ad2f6f8..ed2755bcac8 100644 --- a/graphics/spirv-tools/pkg/PLIST +++ b/graphics/spirv-tools/pkg/PLIST @@ -15,6 +15,10 @@ include/spirv-tools/linker.hpp include/spirv-tools/optimizer.hpp lib/cmake/ lib/cmake/SPIRV-Tools/ +lib/cmake/SPIRV-Tools-diff/ +lib/cmake/SPIRV-Tools-diff/SPIRV-Tools-diffConfig.cmake +lib/cmake/SPIRV-Tools-diff/SPIRV-Tools-diffTargets${MODCMAKE_BUILD_SUFFIX} +lib/cmake/SPIRV-Tools-diff/SPIRV-Tools-diffTargets.cmake lib/cmake/SPIRV-Tools-link/ lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkConfig.cmake lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkTargets${MODCMAKE_BUILD_SUFFIX} @@ -34,6 +38,7 @@ lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceTarget.cmake lib/cmake/SPIRV-Tools/SPIRV-ToolsConfig.cmake lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget${MODCMAKE_BUILD_SUFFIX} lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake +@static-lib lib/libSPIRV-Tools-diff.a @static-lib lib/libSPIRV-Tools-link.a @static-lib lib/libSPIRV-Tools-lint.a @static-lib lib/libSPIRV-Tools-opt.a diff --git a/graphics/vulkan-headers/Makefile b/graphics/vulkan-headers/Makefile index fbe3b503079..4aca5f09b5b 100644 --- a/graphics/vulkan-headers/Makefile +++ b/graphics/vulkan-headers/Makefile @@ -1,6 +1,6 @@ COMMENT = Vulkan header files -V = 1.3.204.1 +V = 1.3.224.1 PKGNAME = vulkan-headers-${V} GH_TAGNAME = sdk-${V} GH_ACCOUNT = KhronosGroup diff --git a/graphics/vulkan-headers/distinfo b/graphics/vulkan-headers/distinfo index c2637e1f001..9d7d9d9e56f 100644 --- a/graphics/vulkan-headers/distinfo +++ b/graphics/vulkan-headers/distinfo @@ -1,2 +1,2 @@ -SHA256 (Vulkan-Headers-sdk-1.3.204.1.tar.gz) = nE0z9xRnyRV0n79IwMOo7ngz8Vur85jjRjzYh5H7WS4= -SIZE (Vulkan-Headers-sdk-1.3.204.1.tar.gz) = 1422950 +SHA256 (Vulkan-Headers-sdk-1.3.224.1.tar.gz) = YovVlDwNAHwZJ2lIDniYAaCI+JJEXIDLM2/JttI2xe8= +SIZE (Vulkan-Headers-sdk-1.3.224.1.tar.gz) = 1521349 diff --git a/graphics/vulkan-headers/patches/patch-registry_apiconventions_py b/graphics/vulkan-headers/patches/patch-registry_apiconventions_py new file mode 100644 index 00000000000..0f7cf2d78da --- /dev/null +++ b/graphics/vulkan-headers/patches/patch-registry_apiconventions_py @@ -0,0 +1,9 @@ +Index: registry/apiconventions.py +--- registry/apiconventions.py.orig ++++ registry/apiconventions.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python3 -i ++#!/usr/bin/env python3 -i + # + # Copyright 2021-2022 The Khronos Group Inc. + # SPDX-License-Identifier: Apache-2.0 diff --git a/graphics/vulkan-headers/patches/patch-registry_conventions_py b/graphics/vulkan-headers/patches/patch-registry_conventions_py deleted file mode 100644 index fa8c44e5875..00000000000 --- a/graphics/vulkan-headers/patches/patch-registry_conventions_py +++ /dev/null @@ -1,9 +0,0 @@ -Index: registry/conventions.py ---- registry/conventions.py.orig -+++ registry/conventions.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python3 -i -+#!/usr/bin/env python3 -i - # - # Copyright 2013-2022 The Khronos Group Inc. - # diff --git a/graphics/vulkan-headers/patches/patch-registry_spec_tools_conventions_py b/graphics/vulkan-headers/patches/patch-registry_spec_tools_conventions_py new file mode 100644 index 00000000000..0bb4b7885b0 --- /dev/null +++ b/graphics/vulkan-headers/patches/patch-registry_spec_tools_conventions_py @@ -0,0 +1,9 @@ +Index: registry/spec_tools/conventions.py +--- registry/spec_tools/conventions.py.orig ++++ registry/spec_tools/conventions.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python3 -i ++#!/usr/bin/env python3 -i + # + # Copyright 2013-2022 The Khronos Group Inc. + # diff --git a/graphics/vulkan-headers/pkg/PLIST b/graphics/vulkan-headers/pkg/PLIST index bec783d7a49..a07ce9df708 100644 --- a/graphics/vulkan-headers/pkg/PLIST +++ b/graphics/vulkan-headers/pkg/PLIST @@ -18,6 +18,7 @@ include/vulkan/vulkan_beta.h include/vulkan/vulkan_core.h include/vulkan/vulkan_directfb.h include/vulkan/vulkan_enums.hpp +include/vulkan/vulkan_format_traits.hpp include/vulkan/vulkan_fuchsia.h include/vulkan/vulkan_funcs.hpp include/vulkan/vulkan_ggp.h @@ -29,6 +30,7 @@ include/vulkan/vulkan_metal.h include/vulkan/vulkan_raii.hpp include/vulkan/vulkan_screen.h include/vulkan/vulkan_structs.hpp +include/vulkan/vulkan_to_string.hpp include/vulkan/vulkan_vi.h include/vulkan/vulkan_wayland.h include/vulkan/vulkan_win32.h @@ -39,12 +41,13 @@ share/vulkan/ share/vulkan/registry/ share/vulkan/registry/apiconventions.py share/vulkan/registry/cgenerator.py -share/vulkan/registry/conventions.py share/vulkan/registry/generator.py share/vulkan/registry/genvk.py share/vulkan/registry/reg.py share/vulkan/registry/spec_tools/ +share/vulkan/registry/spec_tools/conventions.py share/vulkan/registry/spec_tools/util.py share/vulkan/registry/validusage.json +share/vulkan/registry/video.xml share/vulkan/registry/vk.xml share/vulkan/registry/vkconventions.py diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index 171b925068e..8ba9269a1ba 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -1,6 +1,6 @@ COMMENT = Vulkan ICD loader -V = 1.3.204.1 +V = 1.3.224.1 PKGNAME = vulkan-loader-${V} GH_TAGNAME = sdk-${V} GH_ACCOUNT = KhronosGroup diff --git a/graphics/vulkan-loader/distinfo b/graphics/vulkan-loader/distinfo index 57cdd9561c8..8720d8b281a 100644 --- a/graphics/vulkan-loader/distinfo +++ b/graphics/vulkan-loader/distinfo @@ -1,2 +1,2 @@ -SHA256 (Vulkan-Loader-sdk-1.3.204.1.tar.gz) = Xc1CtWSAT0wBiR3dQppKUCgRPEzzm0QlZono9UN3MTQ= -SIZE (Vulkan-Loader-sdk-1.3.204.1.tar.gz) = 1465881 +SHA256 (Vulkan-Loader-sdk-1.3.224.1.tar.gz) = TVSxSJ+qQtMJ5dHjTWZVqVh62Yjpm7Kizg41eETyyy0= +SIZE (Vulkan-Loader-sdk-1.3.224.1.tar.gz) = 1594973 diff --git a/graphics/vulkan-loader/patches/patch-CMakeLists_txt b/graphics/vulkan-loader/patches/patch-CMakeLists_txt index 3612c9d166b..e0012c5a98c 100644 --- a/graphics/vulkan-loader/patches/patch-CMakeLists_txt +++ b/graphics/vulkan-loader/patches/patch-CMakeLists_txt @@ -1,23 +1,19 @@ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -188,13 +188,13 @@ set(LOADER_HELPER_FOLDER "Helper Targets") +@@ -180,9 +180,9 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON) + set(LOADER_HELPER_FOLDER "Helper Targets") if(UNIX) - set( -- FALLBACK_CONFIG_DIRS "/etc/xdg" -+ FALLBACK_CONFIG_DIRS "${SYSCONFDIR}/xdg" - CACHE - STRING - "Search path to use when XDG_CONFIG_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant." - ) - set( -- FALLBACK_DATA_DIRS "/usr/local/share:/usr/share" -+ FALLBACK_DATA_DIRS "${X11BASE}/share:${LOCALBASE}/share:/usr/share" - CACHE - STRING - "Search path to use when XDG_DATA_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant." -@@ -216,6 +216,7 @@ if(UNIX AND NOT APPLE) # i.e.: Linux +- set(FALLBACK_CONFIG_DIRS "/etc/xdg" CACHE STRING ++ set(FALLBACK_CONFIG_DIRS "${SYSCONFDIR}/xdg" CACHE STRING + "Search path to use when XDG_CONFIG_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant.") +- set(FALLBACK_DATA_DIRS "/usr/local/share:/usr/share" CACHE STRING ++ set(FALLBACK_DATA_DIRS "${X11BASE}/share:${LOCALBASE}/share:/usr/share" CACHE STRING + "Search path to use when XDG_DATA_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant.") + set(SYSCONFDIR "" CACHE STRING + "System-wide search directory. If not set or empty, CMAKE_INSTALL_FULL_SYSCONFDIR and /etc are used.") +@@ -208,6 +208,7 @@ if(UNIX AND NOT APPLE) # i.e.: Linux if(BUILD_WSI_XCB_SUPPORT) find_package(XCB REQUIRED) diff --git a/graphics/vulkan-loader/patches/patch-loader_CMakeLists_txt b/graphics/vulkan-loader/patches/patch-loader_CMakeLists_txt deleted file mode 100644 index 92fb40eff5e..00000000000 --- a/graphics/vulkan-loader/patches/patch-loader_CMakeLists_txt +++ /dev/null @@ -1,31 +0,0 @@ -Index: loader/CMakeLists.txt ---- loader/CMakeLists.txt.orig -+++ loader/CMakeLists.txt -@@ -17,7 +17,7 @@ - # limitations under the License. - # ~~~ - --include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/generated ${CMAKE_CURRENT_BINARY_DIR}) -+include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/generated ${CMAKE_CURRENT_BINARY_DIR}) - - # Get version of the API the generated code used and put it into a cmake variable LOADER_GENERATED_HEADER_VERSION - include(generated/loader_generated_header_version.cmake) -@@ -360,7 +360,7 @@ else() - add_library(vulkan-framework SHARED ${NORMAL_LOADER_SRCS} ${OPT_LOADER_SRCS} ${FRAMEWORK_HEADERS}) - endif() - add_dependencies(vulkan-framework loader_asm_gen_files) -- target_link_libraries(vulkan-framework -ldl -lpthread -lm "-framework CoreFoundation") -+ target_link_libraries(vulkan-framework -lpthread -lm "-framework CoreFoundation") - target_link_libraries(vulkan-framework Vulkan::Headers) - - # The FRAMEWORK_VERSION needs to be "A" here so that Xcode code-signing works when a user adds their framework to an Xcode -@@ -385,9 +385,6 @@ else() - # cmake-format: on - endif() - -- if(NOT APPLE) -- target_compile_definitions(vulkan PRIVATE _XOPEN_SOURCE=500) # hush compiler warnings for readlink -- endif() - endif() - - # Generate pkg-config file. diff --git a/graphics/vulkan-loader/patches/patch-loader_allocation_h b/graphics/vulkan-loader/patches/patch-loader_allocation_h deleted file mode 100644 index b7f481af495..00000000000 --- a/graphics/vulkan-loader/patches/patch-loader_allocation_h +++ /dev/null @@ -1,15 +0,0 @@ -Index: loader/allocation.h ---- loader/allocation.h.orig -+++ loader/allocation.h -@@ -39,8 +39,8 @@ void loader_device_heap_free(const struct loader_devic - void *loader_device_heap_realloc(const struct loader_device *device, void *pMemory, size_t orig_size, size_t size, - VkSystemAllocationScope alloc_scope); - --#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) -+#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) - #define loader_stack_alloc(size) alloca(size) - #elif defined(_WIN32) - #define loader_stack_alloc(size) _alloca(size) --#endif // defined(_WIN32) -\ No newline at end of file -+#endif // defined(_WIN32) diff --git a/graphics/vulkan-loader/patches/patch-loader_get_environment_c b/graphics/vulkan-loader/patches/patch-loader_get_environment_c index e4eaccfa064..953f1484c9d 100644 --- a/graphics/vulkan-loader/patches/patch-loader_get_environment_c +++ b/graphics/vulkan-loader/patches/patch-loader_get_environment_c @@ -1,8 +1,8 @@ Index: loader/get_environment.c --- loader/get_environment.c.orig +++ loader/get_environment.c -@@ -37,7 +37,7 @@ - #endif // !defined(VULKAN_NON_CMAKE_BUILD) +@@ -32,7 +32,7 @@ + #include "log.h" // Environment variables -#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) @@ -10,10 +10,3 @@ Index: loader/get_environment.c bool is_high_integrity() { return geteuid() != getuid() || getegid() != getgid(); } -@@ -169,4 +169,4 @@ void loader_free_getenv(char *val, const struct loader - (void)inst; - } - --#endif -\ No newline at end of file -+#endif diff --git a/graphics/vulkan-loader/patches/patch-loader_stack_allocation_h b/graphics/vulkan-loader/patches/patch-loader_stack_allocation_h new file mode 100644 index 00000000000..d6ff9b8cd6a --- /dev/null +++ b/graphics/vulkan-loader/patches/patch-loader_stack_allocation_h @@ -0,0 +1,20 @@ +alloca() header location + +Index: loader/stack_allocation.h +--- loader/stack_allocation.h.orig ++++ loader/stack_allocation.h +@@ -30,11 +30,13 @@ + + #if defined(_WIN32) + #include ++#elif defined(__OpenBSD__) ++#include /* alloca() */ + #else + #include + #endif + +-#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) ++#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) + #define loader_stack_alloc(size) alloca(size) + #elif defined(_WIN32) + #define loader_stack_alloc(size) _alloca(size) diff --git a/graphics/vulkan-loader/patches/patch-loader_unknown_ext_chain_gas_aarch64_S b/graphics/vulkan-loader/patches/patch-loader_unknown_ext_chain_gas_aarch64_S deleted file mode 100644 index dd4647c4ade..00000000000 --- a/graphics/vulkan-loader/patches/patch-loader_unknown_ext_chain_gas_aarch64_S +++ /dev/null @@ -1,16 +0,0 @@ -loader/aarch64: attempt to avoid text relocations in the unknown code -a11162fcaca808eb91c0fa4fbcce99bbcd5d3be2 - -Index: loader/unknown_ext_chain_gas_aarch64.S ---- loader/unknown_ext_chain_gas_aarch64.S.orig -+++ loader/unknown_ext_chain_gas_aarch64.S -@@ -50,7 +50,8 @@ terminError\num: - mov x0, x11 // Vulkan instance pointer (first arg) - mov x1, VK_DEBUG_REPORT_ERROR_BIT_EXT // The error logging bit (second arg) - mov x2, #0 // Zero (third arg) -- ldr x3, =termin_error_string // The error string (fourth arg) -+ adrp x9, termin_error_string -+ add x3, x9, #:lo12:termin_error_string // The error string (fourth arg) - ldr x4, [x11, x10] // The function name (fifth arg) - bl loader_log // Log the error message before we crash - mov x0, #0 diff --git a/graphics/vulkan-loader/patches/patch-loader_vk_loader_platform_h b/graphics/vulkan-loader/patches/patch-loader_vk_loader_platform_h index f69e1b0e350..58c674efea9 100644 --- a/graphics/vulkan-loader/patches/patch-loader_vk_loader_platform_h +++ b/graphics/vulkan-loader/patches/patch-loader_vk_loader_platform_h @@ -3,7 +3,7 @@ stub loader_platform_executable_path() Index: loader/vk_loader_platform.h --- loader/vk_loader_platform.h.orig +++ loader/vk_loader_platform.h -@@ -42,7 +42,7 @@ +@@ -43,7 +43,7 @@ #include "dlopen_fuchsia.h" #endif // defined(__Fuchsia__) @@ -12,7 +12,7 @@ Index: loader/vk_loader_platform.h #include // Note: The following file is for dynamic loading: #include -@@ -50,7 +50,7 @@ +@@ -51,7 +51,7 @@ #include #include @@ -21,43 +21,50 @@ Index: loader/vk_loader_platform.h /* Windows-specific common code: */ // WinBase.h defines CreateSemaphore and synchapi.h defines CreateEvent // undefine them to avoid conflicts with VkLayerDispatchTable struct members. -@@ -102,7 +102,7 @@ - // Override layer information - #define VK_OVERRIDE_LAYER_NAME "VK_LAYER_LUNARG_override" +@@ -98,7 +98,7 @@ + #define LAYERS_PATH_ENV "VK_LAYER_PATH" + #define ENABLED_LAYERS_ENV "VK_INSTANCE_LAYERS" -#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) +#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) /* Linux-specific common code: */ // VK Library Filenames, Paths, etc.: -@@ -156,7 +156,7 @@ static inline bool loader_platform_is_path_absolute(co +@@ -144,7 +144,7 @@ typedef pthread_mutex_t loader_platform_thread_mutex; - static inline char *loader_platform_dirname(char *path) { return dirname(path); } - --#if defined(__linux__) -+#if defined(__unix__) - - // find application path + name. Path cannot be longer than 1024, returns NULL if it is greater than that. - static inline char *loader_platform_executable_path(char *buffer, size_t size) { -@@ -166,7 +166,11 @@ static inline char *loader_platform_executable_path(ch - buffer[count] = '\0'; - return buffer; - } --#elif defined(__APPLE__) // defined(__linux__) -+#elif defined(__OpenBSD__) // defined(__APPLE__) -+static inline char *loader_platform_executable_path(char *buffer, size_t size) { -+ return NULL; -+} -+#elif defined(__APPLE__) // defined(__unix__) - #include - static inline char *loader_platform_executable_path(char *buffer, size_t size) { - pid_t pid = getpid(); -@@ -293,7 +297,7 @@ static inline void loader_platform_thread_cond_wait(lo - } - static inline void loader_platform_thread_cond_broadcast(loader_platform_thread_cond *pCond) { pthread_cond_broadcast(pCond); } + typedef pthread_cond_t loader_platform_thread_cond; -#elif defined(_WIN32) // defined(__linux__) +#elif defined(_WIN32) // defined(__unix__) // VK Library Filenames, Paths, etc.: #define PATH_SEPARATOR ';' +@@ -219,7 +219,7 @@ static inline void loader_platform_thread_once_fn(pthr + + #endif + +-#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) ++#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) + + // File IO + static inline bool loader_platform_file_exists(const char *path) { +@@ -259,6 +259,10 @@ static inline char *loader_platform_executable_path(ch + buffer[ret] = '\0'; + return buffer; + } ++#elif defined(__OpenBSD__) ++static inline char *loader_platform_executable_path(char *buffer, size_t size) { ++ return NULL; ++} + #elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) + #include + static inline char *loader_platform_executable_path(char *buffer, size_t size) { +@@ -357,7 +361,7 @@ static inline void loader_platform_thread_lock_mutex(l + static inline void loader_platform_thread_unlock_mutex(loader_platform_thread_mutex *pMutex) { pthread_mutex_unlock(pMutex); } + static inline void loader_platform_thread_delete_mutex(loader_platform_thread_mutex *pMutex) { pthread_mutex_destroy(pMutex); } + +-#elif defined(_WIN32) // defined(__linux__) ++#elif defined(_WIN32) // defined(__unix__) + + // Get the key for the plug n play driver registry + // The string returned by this function should NOT be freed diff --git a/graphics/vulkan-tools/Makefile b/graphics/vulkan-tools/Makefile index 55308da9b2e..298bf8642e9 100644 --- a/graphics/vulkan-tools/Makefile +++ b/graphics/vulkan-tools/Makefile @@ -1,6 +1,6 @@ COMMENT = Vulkan Utilities and Tools -V = 1.3.204.1 +V = 1.3.224.1 PKGNAME = vulkan-tools-${V} GH_TAGNAME = sdk-${V} GH_ACCOUNT = KhronosGroup diff --git a/graphics/vulkan-tools/distinfo b/graphics/vulkan-tools/distinfo index ddd368465df..d1c52bbf46e 100644 --- a/graphics/vulkan-tools/distinfo +++ b/graphics/vulkan-tools/distinfo @@ -1,2 +1,2 @@ -SHA256 (Vulkan-Tools-sdk-1.3.204.1.tar.gz) = MkL5rRWNAq+cxEGGy9QVmCOHNWot2MBJKvL9rOjCL0k= -SIZE (Vulkan-Tools-sdk-1.3.204.1.tar.gz) = 860458 +SHA256 (Vulkan-Tools-sdk-1.3.224.1.tar.gz) = +oirelQsw+wF0iMW/+3OfAWDUO/nnsXgGcQFqyaNF6A= +SIZE (Vulkan-Tools-sdk-1.3.224.1.tar.gz) = 868463 diff --git a/graphics/vulkan-tools/patches/patch-cube_cube_cpp b/graphics/vulkan-tools/patches/patch-cube_cube_cpp index a6b380f2690..c293ac3c833 100644 --- a/graphics/vulkan-tools/patches/patch-cube_cube_cpp +++ b/graphics/vulkan-tools/patches/patch-cube_cube_cpp @@ -1,8 +1,8 @@ Index: cube/cube.cpp --- cube/cube.cpp.orig +++ cube/cube.cpp -@@ -3269,7 +3269,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPre - return (int)msg.wParam; +@@ -3150,7 +3150,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPre + return static_cast(msg.wParam); } -#elif defined(__linux__) || defined(__FreeBSD__) diff --git a/graphics/vulkan-tools/patches/patch-vulkaninfo_vulkaninfo_h b/graphics/vulkan-tools/patches/patch-vulkaninfo_vulkaninfo_h index c34695f731c..f383bc530c2 100644 --- a/graphics/vulkan-tools/patches/patch-vulkaninfo_vulkaninfo_h +++ b/graphics/vulkan-tools/patches/patch-vulkaninfo_vulkaninfo_h @@ -1,7 +1,7 @@ Index: vulkaninfo/vulkaninfo.h --- vulkaninfo/vulkaninfo.h.orig +++ vulkaninfo/vulkaninfo.h -@@ -66,7 +66,7 @@ +@@ -67,7 +67,7 @@ #endif #endif // _WIN32 @@ -10,7 +10,7 @@ Index: vulkaninfo/vulkaninfo.h #include #endif -@@ -244,7 +244,7 @@ auto GetVector(const char *func_name, F &&f, Ts &&...t +@@ -252,7 +252,7 @@ auto GetVector(const char *func_name, F &&f, Ts &&...t // ----------- Instance Setup ------- // struct VkDll { VkResult Initialize() { @@ -19,7 +19,7 @@ Index: vulkaninfo/vulkaninfo.h library = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL); if (!library) library = dlopen("libvulkan.so.1", RTLD_NOW | RTLD_LOCAL); #elif defined(_WIN32) -@@ -256,7 +256,7 @@ struct VkDll { +@@ -264,7 +264,7 @@ struct VkDll { return VK_SUCCESS; } void Close() { @@ -28,7 +28,7 @@ Index: vulkaninfo/vulkaninfo.h dlclose(library); #elif defined(_WIN32) FreeLibrary(library); -@@ -411,13 +411,13 @@ struct VkDll { +@@ -425,13 +425,13 @@ struct VkDll { private: template void Load(T &func_dest, const char *func_name) { @@ -44,10 +44,3 @@ Index: vulkaninfo/vulkaninfo.h void *library; #elif defined(_WIN32) HMODULE library; -@@ -1747,4 +1747,4 @@ std::unordered_map> F - } - } - return map; --} -\ No newline at end of file -+} diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile index 021ce3635eb..7b9970fb8ac 100644 --- a/graphics/vulkan-validation-layers/Makefile +++ b/graphics/vulkan-validation-layers/Makefile @@ -1,6 +1,6 @@ COMMENT = Vulkan Validation Layers -V = 1.3.204.1 +V = 1.3.224.1 PKGNAME = vulkan-validation-layers-${V} GH_TAGNAME = sdk-${V} GH_ACCOUNT = KhronosGroup diff --git a/graphics/vulkan-validation-layers/distinfo b/graphics/vulkan-validation-layers/distinfo index 7d5e1d06fac..55a7e68bbb6 100644 --- a/graphics/vulkan-validation-layers/distinfo +++ b/graphics/vulkan-validation-layers/distinfo @@ -1,2 +1,2 @@ -SHA256 (Vulkan-ValidationLayers-sdk-1.3.204.1.tar.gz) = peZYpMH1BK44SIrNviqyeZ4q5LYmEE12d28cJLB580E= -SIZE (Vulkan-ValidationLayers-sdk-1.3.204.1.tar.gz) = 3657199 +SHA256 (Vulkan-ValidationLayers-sdk-1.3.224.1.tar.gz) = ScAOARnjvBHhPAx0DlfHa1grFPdU83ebhVCMTZDZ34U= +SIZE (Vulkan-ValidationLayers-sdk-1.3.224.1.tar.gz) = 4193944 diff --git a/graphics/vulkan-validation-layers/patches/patch-CMakeLists_txt b/graphics/vulkan-validation-layers/patches/patch-CMakeLists_txt index 8b3a3c81a74..4ac0b841133 100644 --- a/graphics/vulkan-validation-layers/patches/patch-CMakeLists_txt +++ b/graphics/vulkan-validation-layers/patches/patch-CMakeLists_txt @@ -11,7 +11,7 @@ Index: CMakeLists.txt endif() if(BUILD_WSI_XLIB_SUPPORT) -@@ -251,9 +252,10 @@ option(BUILD_LAYERS "Build layers" ON) +@@ -238,9 +239,10 @@ option(BUILD_LAYERS "Build layers" ON) option(BUILD_LAYER_SUPPORT_FILES "Generate layer files" OFF) # For generating files when not building layers option(USE_ROBIN_HOOD_HASHING "Use robin-hood-hashing" ON) if (USE_ROBIN_HOOD_HASHING) @@ -24,7 +24,7 @@ Index: CMakeLists.txt endif() if(BUILD_LAYERS OR BUILD_TESTS) -@@ -383,7 +385,7 @@ target_include_directories(VkLayer_utils +@@ -370,7 +372,7 @@ target_include_directories(VkLayer_utils ${VulkanHeaders_INCLUDE_DIR}) if (USE_ROBIN_HOOD_HASHING) diff --git a/graphics/vulkan-validation-layers/patches/patch-layers_best_practices_utils_cpp b/graphics/vulkan-validation-layers/patches/patch-layers_best_practices_utils_cpp deleted file mode 100644 index 0f632d3fc01..00000000000 --- a/graphics/vulkan-validation-layers/patches/patch-layers_best_practices_utils_cpp +++ /dev/null @@ -1,16 +0,0 @@ -avoid 'mips' namespace collision with on mips64 - -Index: layers/best_practices_utils.cpp ---- layers/best_practices_utils.cpp.orig -+++ layers/best_practices_utils.cpp -@@ -376,8 +376,8 @@ IMAGE_STATE_BP* BestPractices::GetImageUsageState(VkIm - auto image = Get(vk_image); - state.image = image.get(); - state.usages.resize(image->createInfo.arrayLayers); -- for (auto& mips : state.usages) { -- mips.resize(image->createInfo.mipLevels, IMAGE_SUBRESOURCE_USAGE_BP::UNDEFINED); -+ for (auto& vk_mips : state.usages) { -+ vk_mips.resize(image->createInfo.mipLevels, IMAGE_SUBRESOURCE_USAGE_BP::UNDEFINED); - } - return &state; - } diff --git a/graphics/vulkan-validation-layers/patches/patch-layers_vk_mem_alloc_h b/graphics/vulkan-validation-layers/patches/patch-layers_vk_mem_alloc_h index 333d26275e5..6263f1d6e36 100644 --- a/graphics/vulkan-validation-layers/patches/patch-layers_vk_mem_alloc_h +++ b/graphics/vulkan-validation-layers/patches/patch-layers_vk_mem_alloc_h @@ -1,12 +1,12 @@ Index: layers/vk_mem_alloc.h --- layers/vk_mem_alloc.h.orig +++ layers/vk_mem_alloc.h -@@ -3181,7 +3181,7 @@ void *aligned_alloc(size_t alignment, size_t size) +@@ -2700,7 +2700,7 @@ static void* vma_aligned_alloc(size_t alignment, size_ return memalign(alignment, size); } --#elif defined(__APPLE__) || defined(__ANDROID__) -+#elif defined(__APPLE__) || defined(__ANDROID__) || defined(__unix__) - # define ALIGNED_ALLOC_WITH_POSIX_MEMALIGN +-#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) ++#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) || defined(__OpenBSD__) + #define ALIGNED_ALLOC_WITH_POSIX_MEMALIGN #elif defined(__GNU_LIBRARY__) # if !defined(__GLIBC_PREREQ) || !__GLIBC_PREREQ(2, 16)