cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update vulkan ports to SDK 1.3.224.1 (and glslang to 11.11.0)

Browse Source 
tested also by jsg@ on arm64 and amd64 with no issues with latest Mesa.
This commit is contained in:
thfr 2022-10-30 22:51:56 +00:00
parent a392c93891
commit 90b97d0323
33 changed files with 135 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
graphics/glslang/Makefile
View File

@ -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

4
graphics/glslang/distinfo
View File

@ -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

14
graphics/glslang/pkg/PLIST
View File

@ -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

2
graphics/spirv-headers/Makefile
View File

@ -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

4
graphics/spirv-headers/distinfo
View File

@ -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

1
graphics/spirv-headers/pkg/PLIST
View File

@ -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

2
graphics/spirv-tools/Makefile
View File

@ -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

4
graphics/spirv-tools/distinfo
View File

@ -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

5
graphics/spirv-tools/pkg/PLIST
View File

@ -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

2
graphics/vulkan-headers/Makefile
View File

@ -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

4
graphics/vulkan-headers/distinfo
View File

@ -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

9
graphics/vulkan-headers/patches/patch-registry_apiconventions_py Normal file
View File

@ -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

9
graphics/vulkan-headers/patches/patch-registry_conventions_py
View File

@ -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.
#

9
graphics/vulkan-headers/patches/patch-registry_spec_tools_conventions_py Normal file
View File

@ -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.
#

5
graphics/vulkan-headers/pkg/PLIST
View File

@ -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

2
graphics/vulkan-loader/Makefile
View File

@ -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

4
graphics/vulkan-loader/distinfo
View File

@ -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

26
graphics/vulkan-loader/patches/patch-CMakeLists_txt
View File

@ -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)

31
graphics/vulkan-loader/patches/patch-loader_CMakeLists_txt
View File

@ -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.

15
graphics/vulkan-loader/patches/patch-loader_allocation_h
View File

@ -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)

11
graphics/vulkan-loader/patches/patch-loader_get_environment_c
View File

@ -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

20
graphics/vulkan-loader/patches/patch-loader_stack_allocation_h Normal file
View File

@ -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 <malloc.h>
+#elif defined(__OpenBSD__)
+#include <stdlib.h> /* alloca() */
#else
#include <alloca.h>
#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)

16
graphics/vulkan-loader/patches/patch-loader_unknown_ext_chain_gas_aarch64_S
View File

@ -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

65
graphics/vulkan-loader/patches/patch-loader_vk_loader_platform_h
View File

@ -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 <unistd.h>
// Note: The following file is for dynamic loading:
#include <dlfcn.h>
@@ -50,7 +50,7 @@
@@ -51,7 +51,7 @@
#include <stdlib.h>
#include <libgen.h>
@ -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 <libproc.h>
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 <sys/sysctl.h>
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

2
graphics/vulkan-tools/Makefile
View File

@ -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

4
graphics/vulkan-tools/distinfo
View File

@ -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

4
graphics/vulkan-tools/patches/patch-cube_cube_cpp
View File

@ -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<int>(msg.wParam);
}
-#elif defined(__linux__) || defined(__FreeBSD__)

15
graphics/vulkan-tools/patches/patch-vulkaninfo_vulkaninfo_h
View File

@ -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 <dlfcn.h>
#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 <typename T>
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<PropFlags, std::vector<VkFormat>> F
}
}
return map;
-}
\ No newline at end of file
+}

2
graphics/vulkan-validation-layers/Makefile
View File

@ -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

4
graphics/vulkan-validation-layers/distinfo
View File

@ -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

4
graphics/vulkan-validation-layers/patches/patch-CMakeLists_txt
View File

@ -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)

16
graphics/vulkan-validation-layers/patches/patch-layers_best_practices_utils_cpp
View File

@ -1,16 +0,0 @@
avoid 'mips' namespace collision with <built-in> 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<IMAGE_STATE>(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;
}

8
graphics/vulkan-validation-layers/patches/patch-layers_vk_mem_alloc_h
View File

@ -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)