This updates all vulkan ports to the latest SDK from January. Tested it
with and without validation layers on my Intel Tigerlake integrated GPU
without issues, including vkcube, vkcubepp, vulkaninfo, and vkquake.
Overall a lot fewer patches needed; I think Brad has been working hard
to upstream some of our patches.
Index: glslang/Makefile
===================================================================
RCS file: /cvs/ports/graphics/glslang/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- glslang/Makefile 13 Nov 2022 15:28:41 -0000 1.14
+++ glslang/Makefile 5 Feb 2023 22:23:00 -0000
@@ -2,10 +2,9 @@ PORTROACH = limit:^[0-9]
COMMENT = reference front-end for GLSL and ESSL
-GH_TAGNAME = 11.11.0
+GH_TAGNAME = 12.0.0
GH_ACCOUNT = KhronosGroup
GH_PROJECT = glslang
-REVISION = 0
CATEGORIES = devel graphics
Index: glslang/distinfo
===================================================================
RCS file: /cvs/ports/graphics/glslang/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- glslang/distinfo 30 Oct 2022 22:51:56 -0000 1.6
+++ glslang/distinfo 5 Feb 2023 22:23:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (glslang-11.11.0.tar.gz) = JsIWwwYlEsAYy911IiS42tcDt+W7kL8zi6LbtdTxFDg=
-SIZE (glslang-11.11.0.tar.gz) = 3542123
+SHA256 (glslang-12.0.0.tar.gz) = fLRYQuwdS26nddYkw9LYupRQqkFrBIKwzH5P3TmcPXU=
+SIZE (glslang-12.0.0.tar.gz) = 3682791
Index: glslang/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/glslang/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- glslang/pkg/PLIST 30 Oct 2022 22:51:56 -0000 1.5
+++ glslang/pkg/PLIST 5 Feb 2023 22:23:00 -0000
@@ -46,9 +46,12 @@ include/glslang/MachineIndependent/prepr
include/glslang/MachineIndependent/propagateNoContraction.h
include/glslang/MachineIndependent/reflection.h
include/glslang/Public/
+include/glslang/Public/ResourceLimits.h
include/glslang/Public/ShaderLang.h
+include/glslang/Public/resource_limits_c.h
include/glslang/SPIRV/
include/glslang/SPIRV/GLSL.ext.AMD.h
+include/glslang/SPIRV/GLSL.ext.ARM.h
include/glslang/SPIRV/GLSL.ext.EXT.h
include/glslang/SPIRV/GLSL.ext.KHR.h
include/glslang/SPIRV/GLSL.ext.NV.h
@@ -56,6 +59,7 @@ include/glslang/SPIRV/GLSL.std.450.h
include/glslang/SPIRV/GlslangToSpv.h
include/glslang/SPIRV/Logger.h
include/glslang/SPIRV/NonSemanticDebugPrintf.h
+include/glslang/SPIRV/NonSemanticShaderDebugInfo100.h
include/glslang/SPIRV/SPVRemapper.h
include/glslang/SPIRV/SpvBuilder.h
include/glslang/SPIRV/SpvTools.h
@@ -72,7 +76,12 @@ lib/cmake/OGLCompilerTargets.cmake
lib/cmake/OSDependentTargets.cmake
lib/cmake/SPIRVTargets.cmake
lib/cmake/SPVRemapperTargets.cmake
+lib/cmake/glslang/
lib/cmake/glslang-default-resource-limitsTargets.cmake
+lib/cmake/glslang/glslang-config-version.cmake
+lib/cmake/glslang/glslang-config.cmake
+lib/cmake/glslang/glslang-targets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/glslang/glslang-targets.cmake
lib/cmake/glslangTargets.cmake
lib/cmake/glslangValidatorTargets.cmake
lib/cmake/spirv-remapTargets.cmake
@@ -85,8 +94,3 @@ 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
Index: spirv-headers/Makefile
===================================================================
RCS file: /cvs/ports/graphics/spirv-headers/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- spirv-headers/Makefile 30 Oct 2022 22:51:56 -0000 1.10
+++ spirv-headers/Makefile 5 Feb 2023 22:23:00 -0000
@@ -1,6 +1,6 @@
COMMENT = SPIRV-Headers
-V = 1.3.224.1
+V = 1.3.239.0
DISTNAME = spirv-headers-${V}
GH_ACCOUNT = KhronosGroup
GH_PROJECT = SPIRV-Headers
Index: spirv-headers/distinfo
===================================================================
RCS file: /cvs/ports/graphics/spirv-headers/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- spirv-headers/distinfo 30 Oct 2022 22:51:56 -0000 1.8
+++ spirv-headers/distinfo 5 Feb 2023 22:23:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (spirv-headers-1.3.224.1.tar.gz) =
yFcUv+YvhAByhr07PARxrwp+BqtmvCykYjBDARsoc38=
-SIZE (spirv-headers-1.3.224.1.tar.gz) = 437010
+SHA256 (spirv-headers-1.3.239.0.tar.gz) =
/a9mcOMRzRwIrpC/gT6J3TFjAgW8YAMP/SX7CvObUf4=
+SIZE (spirv-headers-1.3.239.0.tar.gz) = 446295
Index: spirv-tools/Makefile
===================================================================
RCS file: /cvs/ports/graphics/spirv-tools/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- spirv-tools/Makefile 30 Oct 2022 22:51:56 -0000 1.13
+++ spirv-tools/Makefile 5 Feb 2023 22:23:00 -0000
@@ -1,6 +1,6 @@
COMMENT = API and commands for processing SPIR-V
-V = 1.3.224.1
+V = 1.3.239.0
DISTNAME = spirv-tools-${V}
GH_ACCOUNT = KhronosGroup
GH_PROJECT = SPIRV-Tools
Index: spirv-tools/distinfo
===================================================================
RCS file: /cvs/ports/graphics/spirv-tools/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- spirv-tools/distinfo 30 Oct 2022 22:51:56 -0000 1.9
+++ spirv-tools/distinfo 5 Feb 2023 22:23:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (spirv-tools-1.3.224.1.tar.gz) =
yteOVCvy+lnjMBnngN+Obftan0Qgo/ziO0wWKiET4W4=
-SIZE (spirv-tools-1.3.224.1.tar.gz) = 3033574
+SHA256 (spirv-tools-1.3.239.0.tar.gz) =
MnstukUVZG7uKMGl/hMyiR6ByLb/KJNj9Sh38+Z8LYE=
+SIZE (spirv-tools-1.3.239.0.tar.gz) = 3088996
Index: spirv-tools/patches/patch-CMakeLists_txt
===================================================================
RCS file: spirv-tools/patches/patch-CMakeLists_txt
diff -N spirv-tools/patches/patch-CMakeLists_txt
--- spirv-tools/patches/patch-CMakeLists_txt 11 Mar 2022 19:23:27 -0000
1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: CMakeLists.txt
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -56,6 +56,8 @@ elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Android")
- set(SPIRV_TIMER_ENABLED ${SPIRV_ALLOW_TIMERS})
- elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
- add_definitions(-DSPIRV_FREEBSD)
-+elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD")
-+ add_definitions(-DSPIRV_OPENBSD)
- elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia")
- add_definitions(-DSPIRV_FUCHSIA)
- else()
Index: spirv-tools/patches/patch-source_print_cpp
===================================================================
RCS file: spirv-tools/patches/patch-source_print_cpp
diff -N spirv-tools/patches/patch-source_print_cpp
--- spirv-tools/patches/patch-source_print_cpp 11 Mar 2022 19:23:27 -0000
1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-Index: source/print.cpp
---- source/print.cpp.orig
-+++ source/print.cpp
-@@ -16,7 +16,8 @@
-
- #if defined(SPIRV_ANDROID) || defined(SPIRV_LINUX) || defined(SPIRV_MAC) || \
- defined(SPIRV_IOS) || defined(SPIRV_TVOS) || defined(SPIRV_FREEBSD) || \
-- defined(SPIRV_EMSCRIPTEN) || defined(SPIRV_FUCHSIA)
-+ defined(SPIRV_EMSCRIPTEN) || defined(SPIRV_FUCHSIA) || \
-+ defined(SPIRV_OPENBSD)
- namespace spvtools {
-
- clr::reset::operator const char*() { return "\x1b[0m"; }
Index: spirv-tools/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/spirv-tools/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- spirv-tools/pkg/PLIST 30 Oct 2022 22:51:57 -0000 1.5
+++ spirv-tools/pkg/PLIST 5 Feb 2023 22:23:00 -0000
@@ -35,6 +35,10 @@ lib/cmake/SPIRV-Tools-reduce/
lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceConfig.cmake
lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceTarget${MODCMAKE_BUILD_SUFFIX}
lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceTarget.cmake
+lib/cmake/SPIRV-Tools-tools/
+lib/cmake/SPIRV-Tools-tools/SPIRV-Tools-toolsConfig.cmake
+lib/cmake/SPIRV-Tools-tools/SPIRV-Tools-toolsTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/SPIRV-Tools-tools/SPIRV-Tools-toolsTargets.cmake
lib/cmake/SPIRV-Tools/SPIRV-ToolsConfig.cmake
lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget${MODCMAKE_BUILD_SUFFIX}
lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake
Index: vulkan-headers/Makefile
===================================================================
RCS file: /cvs/ports/graphics/vulkan-headers/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- vulkan-headers/Makefile 30 Oct 2022 22:51:57 -0000 1.11
+++ vulkan-headers/Makefile 5 Feb 2023 22:23:00 -0000
@@ -1,6 +1,6 @@
COMMENT = Vulkan header files
-V = 1.3.224.1
+V = 1.3.239.0
PKGNAME = vulkan-headers-${V}
GH_TAGNAME = sdk-${V}
GH_ACCOUNT = KhronosGroup
Index: vulkan-headers/distinfo
===================================================================
RCS file: /cvs/ports/graphics/vulkan-headers/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- vulkan-headers/distinfo 30 Oct 2022 22:51:57 -0000 1.8
+++ vulkan-headers/distinfo 5 Feb 2023 22:23:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (Vulkan-Headers-sdk-1.3.224.1.tar.gz) =
YovVlDwNAHwZJ2lIDniYAaCI+JJEXIDLM2/JttI2xe8=
-SIZE (Vulkan-Headers-sdk-1.3.224.1.tar.gz) = 1521349
+SHA256 (Vulkan-Headers-sdk-1.3.239.0.tar.gz) =
hl+o6OgxT8ymB3epL1C9DPYSIFo25xnWl1SC0zZvYZ4=
+SIZE (Vulkan-Headers-sdk-1.3.239.0.tar.gz) = 1804393
Index: vulkan-headers/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/vulkan-headers/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- vulkan-headers/pkg/PLIST 30 Oct 2022 22:51:57 -0000 1.9
+++ vulkan-headers/pkg/PLIST 5 Feb 2023 22:23:00 -0000
@@ -29,6 +29,7 @@ include/vulkan/vulkan_macos.h
include/vulkan/vulkan_metal.h
include/vulkan/vulkan_raii.hpp
include/vulkan/vulkan_screen.h
+include/vulkan/vulkan_static_assertions.hpp
include/vulkan/vulkan_structs.hpp
include/vulkan/vulkan_to_string.hpp
include/vulkan/vulkan_vi.h
@@ -37,16 +38,24 @@ include/vulkan/vulkan_win32.h
include/vulkan/vulkan_xcb.h
include/vulkan/vulkan_xlib.h
include/vulkan/vulkan_xlib_xrandr.h
+share/cmake/
+share/cmake/VulkanHeaders/
+share/cmake/VulkanHeaders/VulkanHeadersConfig.cmake
+share/cmake/VulkanHeaders/VulkanHeadersConfigVersion.cmake
+share/cmake/VulkanHeaders/VulkanHeadersTargets.cmake
share/vulkan/
share/vulkan/registry/
share/vulkan/registry/apiconventions.py
share/vulkan/registry/cgenerator.py
share/vulkan/registry/generator.py
share/vulkan/registry/genvk.py
+share/vulkan/registry/profiles/
+share/vulkan/registry/profiles/VP_KHR_roadmap_2022.json
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/stripAPI.py
share/vulkan/registry/validusage.json
share/vulkan/registry/video.xml
share/vulkan/registry/vk.xml
Index: vulkan-loader/Makefile
===================================================================
RCS file: /cvs/ports/graphics/vulkan-loader/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- vulkan-loader/Makefile 30 Oct 2022 22:51:57 -0000 1.17
+++ vulkan-loader/Makefile 5 Feb 2023 22:23:00 -0000
@@ -1,6 +1,6 @@
COMMENT = Vulkan ICD loader
-V = 1.3.224.1
+V = 1.3.239.0
PKGNAME = vulkan-loader-${V}
GH_TAGNAME = sdk-${V}
GH_ACCOUNT = KhronosGroup
Index: vulkan-loader/distinfo
===================================================================
RCS file: /cvs/ports/graphics/vulkan-loader/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- vulkan-loader/distinfo 30 Oct 2022 22:51:57 -0000 1.8
+++ vulkan-loader/distinfo 5 Feb 2023 22:23:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (Vulkan-Loader-sdk-1.3.224.1.tar.gz) =
TVSxSJ+qQtMJ5dHjTWZVqVh62Yjpm7Kizg41eETyyy0=
-SIZE (Vulkan-Loader-sdk-1.3.224.1.tar.gz) = 1594973
+SHA256 (Vulkan-Loader-sdk-1.3.239.0.tar.gz) =
+iB4QIeTshc/F0FzqHhN5Wtrv7y1+5WKB+Ru8SbH6to=
+SIZE (Vulkan-Loader-sdk-1.3.239.0.tar.gz) = 1646923
Index: vulkan-loader/patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/graphics/vulkan-loader/patches/patch-CMakeLists_txt,v
retrieving revision 1.9
diff -u -p -r1.9 patch-CMakeLists_txt
--- vulkan-loader/patches/patch-CMakeLists_txt 30 Oct 2022 22:51:57 -0000
1.9
+++ vulkan-loader/patches/patch-CMakeLists_txt 5 Feb 2023 22:23:00 -0000
@@ -1,7 +1,7 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -180,9 +180,9 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+@@ -149,9 +149,9 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
set(LOADER_HELPER_FOLDER "Helper Targets")
if(UNIX)
@@ -13,11 +13,3 @@ Index: CMakeLists.txt
"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)
-+ include_directories(${XCB_INCLUDE_DIR})
- endif()
-
- if(BUILD_WSI_XLIB_SUPPORT)
Index: vulkan-loader/patches/patch-loader_get_environment_c
===================================================================
RCS file: vulkan-loader/patches/patch-loader_get_environment_c
diff -N vulkan-loader/patches/patch-loader_get_environment_c
--- vulkan-loader/patches/patch-loader_get_environment_c 30 Oct 2022
22:51:57 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: loader/get_environment.c
---- loader/get_environment.c.orig
-+++ loader/get_environment.c
-@@ -32,7 +32,7 @@
- #include "log.h"
-
- // Environment variables
--#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) ||
defined(__QNXNTO__) || defined(__FreeBSD__)
-+#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) ||
defined(__QNXNTO__) || defined(__FreeBSD__)
-
- bool is_high_integrity() { return geteuid() != getuid() || getegid() !=
getgid(); }
-
Index: vulkan-loader/patches/patch-loader_get_environment_h
===================================================================
RCS file: vulkan-loader/patches/patch-loader_get_environment_h
diff -N vulkan-loader/patches/patch-loader_get_environment_h
--- vulkan-loader/patches/patch-loader_get_environment_h 11 Mar 2022
19:23:30 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-Index: loader/get_environment.h
---- loader/get_environment.h.orig
-+++ loader/get_environment.h
-@@ -35,10 +35,10 @@
- char *loader_getenv(const char *name, const struct loader_instance *inst);
- void loader_free_getenv(char *val, const struct loader_instance *inst);
-
--#if defined(WIN32) || defined(__linux__) || defined(__APPLE__) ||
defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__)
-+#if defined(WIN32) || defined(__unix__) || defined(__APPLE__) ||
defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__)
-
- bool is_high_integrity();
-
- char *loader_secure_getenv(const char *name, const struct loader_instance
*inst);
-
--#endif
-\ No newline at end of file
-+#endif
Index: vulkan-loader/patches/patch-loader_stack_allocation_h
===================================================================
RCS file: vulkan-loader/patches/patch-loader_stack_allocation_h
diff -N vulkan-loader/patches/patch-loader_stack_allocation_h
--- vulkan-loader/patches/patch-loader_stack_allocation_h 30 Oct 2022
22:51:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-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)
Index: vulkan-loader/patches/patch-loader_vk_loader_platform_h
===================================================================
RCS file:
/cvs/ports/graphics/vulkan-loader/patches/patch-loader_vk_loader_platform_h,v
retrieving revision 1.7
diff -u -p -r1.7 patch-loader_vk_loader_platform_h
--- vulkan-loader/patches/patch-loader_vk_loader_platform_h 30 Oct 2022
22:51:57 -0000 1.7
+++ vulkan-loader/patches/patch-loader_vk_loader_platform_h 5 Feb 2023
22:23:00 -0000
@@ -1,18 +1,7 @@
-stub loader_platform_executable_path()
-
Index: loader/vk_loader_platform.h
--- loader/vk_loader_platform.h.orig
+++ loader/vk_loader_platform.h
-@@ -43,7 +43,7 @@
- #include "dlopen_fuchsia.h"
- #endif // defined(__Fuchsia__)
-
--#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) ||
defined(__QNXNTO__) || defined(__FreeBSD__)
-+#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) ||
defined(__QNXNTO__) || defined(__FreeBSD__)
- #include <unistd.h>
- // Note: The following file is for dynamic loading:
- #include <dlfcn.h>
-@@ -51,7 +51,7 @@
+@@ -52,7 +52,7 @@
#include <stdlib.h>
#include <libgen.h>
@@ -21,16 +10,7 @@ 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.
-@@ -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.:
-@@ -144,7 +144,7 @@ typedef pthread_mutex_t loader_platform_thread_mutex;
+@@ -157,7 +157,7 @@ typedef pthread_mutex_t loader_platform_thread_mutex;
typedef pthread_cond_t loader_platform_thread_cond;
@@ -39,27 +19,7 @@ Index: loader/vk_loader_platform.h
// 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
+@@ -371,7 +375,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); }
Index: vulkan-tools/Makefile
===================================================================
RCS file: /cvs/ports/graphics/vulkan-tools/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- vulkan-tools/Makefile 30 Oct 2022 22:51:57 -0000 1.13
+++ vulkan-tools/Makefile 5 Feb 2023 22:23:00 -0000
@@ -1,6 +1,6 @@
COMMENT = Vulkan Utilities and Tools
-V = 1.3.224.1
+V = 1.3.239.0
PKGNAME = vulkan-tools-${V}
GH_TAGNAME = sdk-${V}
GH_ACCOUNT = KhronosGroup
@@ -14,7 +14,7 @@ MAINTAINER = Thomas Frohwein <thfr@openb
# Apache 2.0
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} ICE SM X11 Xext c m vulkan xcb
+WANTLIB += ${COMPILER_LIBCXX} X11 c m vulkan xcb
# C++11
COMPILER = base-clang ports-gcc
@@ -22,7 +22,6 @@ COMPILER = base-clang ports-gcc
MODULES = devel/cmake \
lang/python
-
MODPY_RUNDEP = No
BUILD_DEPENDS = graphics/glslang \
@@ -30,8 +29,10 @@ BUILD_DEPENDS = graphics/glslang \
LIB_DEPENDS = graphics/vulkan-loader
CONFIGURE_ARGS += -DGLSLANG_INSTALL_DIR="${LOCALBASE}" \
- -DBUILD_WSI_WAYLAND_SUPPORT=False
+ -DBUILD_WSI_WAYLAND_SUPPORT=OFF
NO_TEST = Yes
+
+CXXFLAGS += -I${X11BASE}/include
.include <bsd.port.mk>
Index: vulkan-tools/distinfo
===================================================================
RCS file: /cvs/ports/graphics/vulkan-tools/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- vulkan-tools/distinfo 30 Oct 2022 22:51:57 -0000 1.8
+++ vulkan-tools/distinfo 5 Feb 2023 22:23:00 -0000
@@ -1,2 +1,2 @@
-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
+SHA256 (Vulkan-Tools-sdk-1.3.239.0.tar.gz) =
Xz7R/d74WBvxiMnQed18FmLY93m2gpd/8NxZQrE3d/Q=
+SIZE (Vulkan-Tools-sdk-1.3.239.0.tar.gz) = 775603
Index: vulkan-tools/patches/patch-cube_cube_cpp
===================================================================
RCS file: vulkan-tools/patches/patch-cube_cube_cpp
diff -N vulkan-tools/patches/patch-cube_cube_cpp
--- vulkan-tools/patches/patch-cube_cube_cpp 30 Oct 2022 22:51:57 -0000
1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: cube/cube.cpp
---- cube/cube.cpp.orig
-+++ cube/cube.cpp
-@@ -3150,7 +3150,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPre
- return static_cast<int>(msg.wParam);
- }
-
--#elif defined(__linux__) || defined(__FreeBSD__)
-+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-
- int main(int argc, char **argv) {
- Demo demo;
Index: vulkan-tools/patches/patch-icd_CMakeLists_txt
===================================================================
RCS file: vulkan-tools/patches/patch-icd_CMakeLists_txt
diff -N vulkan-tools/patches/patch-icd_CMakeLists_txt
--- vulkan-tools/patches/patch-icd_CMakeLists_txt 11 Mar 2022 19:23:31
-0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: icd/CMakeLists.txt
---- icd/CMakeLists.txt.orig
-+++ icd/CMakeLists.txt
-@@ -24,6 +24,8 @@ elseif(APPLE)
- elseif(UNIX AND NOT APPLE) # i.e. Linux
- if(BUILD_WSI_XCB_SUPPORT)
- add_definitions(-DVK_USE_PLATFORM_XCB_KHR -DVK_USE_PLATFORM_XCB_KHX)
-+ find_package(XCB REQUIRED)
-+ include_directories(${XCB_INCLUDE_DIR})
- endif()
-
- if(BUILD_WSI_XLIB_SUPPORT)
Index: vulkan-tools/patches/patch-vulkaninfo_vulkaninfo_h
===================================================================
RCS file: vulkan-tools/patches/patch-vulkaninfo_vulkaninfo_h
diff -N vulkan-tools/patches/patch-vulkaninfo_vulkaninfo_h
--- vulkan-tools/patches/patch-vulkaninfo_vulkaninfo_h 30 Oct 2022 22:51:57
-0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,46 +0,0 @@
-Index: vulkaninfo/vulkaninfo.h
---- vulkaninfo/vulkaninfo.h.orig
-+++ vulkaninfo/vulkaninfo.h
-@@ -67,7 +67,7 @@
- #endif
- #endif // _WIN32
-
--#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
-+#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) ||
defined(__OpenBSD__)
- #include <dlfcn.h>
- #endif
-
-@@ -252,7 +252,7 @@ auto GetVector(const char *func_name, F &&f, Ts &&...t
- // ----------- Instance Setup ------- //
- struct VkDll {
- VkResult Initialize() {
--#if defined(__linux__) || defined(__FreeBSD__)
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
- library = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL);
- if (!library) library = dlopen("libvulkan.so.1", RTLD_NOW |
RTLD_LOCAL);
- #elif defined(_WIN32)
-@@ -264,7 +264,7 @@ struct VkDll {
- return VK_SUCCESS;
- }
- void Close() {
--#if defined(__linux__) || defined(__FreeBSD__)
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
- dlclose(library);
- #elif defined(_WIN32)
- FreeLibrary(library);
-@@ -425,13 +425,13 @@ struct VkDll {
- private:
- template <typename T>
- void Load(T &func_dest, const char *func_name) {
--#if defined(__linux__) || defined(__FreeBSD__)
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
- func_dest = reinterpret_cast<T>(dlsym(library, func_name));
- #elif defined(_WIN32)
- func_dest = reinterpret_cast<T>(GetProcAddress(library, func_name));
- #endif
- }
--#if defined(__linux__) || defined(__FreeBSD__)
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
- void *library;
- #elif defined(_WIN32)
- HMODULE library;
Index: vulkan-validation-layers/Makefile
===================================================================
RCS file: /cvs/ports/graphics/vulkan-validation-layers/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- vulkan-validation-layers/Makefile 30 Oct 2022 22:51:57 -0000 1.15
+++ vulkan-validation-layers/Makefile 5 Feb 2023 22:23:00 -0000
@@ -1,6 +1,6 @@
COMMENT = Vulkan Validation Layers
-V = 1.3.224.1
+V = 1.3.239.0
PKGNAME = vulkan-validation-layers-${V}
GH_TAGNAME = sdk-${V}
GH_ACCOUNT = KhronosGroup
@@ -32,11 +32,13 @@ CONFIGURE_ARGS += -DBUILD_WSI_WAYLAND_SU
-DSPIRV_HEADERS_INSTALL_DIR=${LOCALBASE}/include/spirv \
-DBUILD_WERROR=False
+# Tests only build if Google Test framework is in directory external/
+NO_TEST = Yes
+
+CXXFLAGS += -I${X11BASE}/include
+
.if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
CXXFLAGS += -mxgot
.endif
-
-# Tests only build if Google Test framework is in directory external/
-NO_TEST = Yes
.include <bsd.port.mk>
Index: vulkan-validation-layers/distinfo
===================================================================
RCS file: /cvs/ports/graphics/vulkan-validation-layers/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- vulkan-validation-layers/distinfo 30 Oct 2022 22:51:57 -0000 1.8
+++ vulkan-validation-layers/distinfo 5 Feb 2023 22:23:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (Vulkan-ValidationLayers-sdk-1.3.224.1.tar.gz) =
ScAOARnjvBHhPAx0DlfHa1grFPdU83ebhVCMTZDZ34U=
-SIZE (Vulkan-ValidationLayers-sdk-1.3.224.1.tar.gz) = 4193944
+SHA256 (Vulkan-ValidationLayers-sdk-1.3.239.0.tar.gz) =
eqf7RuJeXvAUTSnJISK2Mdx8fGgEpjOfGVs2itUzKOQ=
+SIZE (Vulkan-ValidationLayers-sdk-1.3.239.0.tar.gz) = 4549587
Index: vulkan-validation-layers/patches/patch-CMakeLists_txt
===================================================================
RCS file: vulkan-validation-layers/patches/patch-CMakeLists_txt
diff -N vulkan-validation-layers/patches/patch-CMakeLists_txt
--- vulkan-validation-layers/patches/patch-CMakeLists_txt 30 Oct 2022
22:51:57 -0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@
-fix robin-hood-hashing detection
-
-Index: CMakeLists.txt
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -167,6 +167,7 @@ if(UNIX AND NOT APPLE) # i.e. Linux
-
- if(BUILD_WSI_XCB_SUPPORT)
- find_package(XCB REQUIRED)
-+ include_directories(${XCB_INCLUDE_DIR})
- endif()
-
- if(BUILD_WSI_XLIB_SUPPORT)
-@@ -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)
-- if (NOT TARGET robin_hood::robin_hood)
-- find_package(robin_hood REQUIRED CONFIG)
-+ if(NOT ROBIN_HOOD_HASHING_INSTALL_DIR)
-+ set(ROBIN_HOOD_HASHING_INSTALL_DIR
$ENV{ROBIN_HOOD_HASHING_INSTALL_DIR} PATH "Path to robin-hood-hashing
repository")
- endif()
-+ set(ROBIN_HOOD_HASHING_INCLUDE_DIR
"${ROBIN_HOOD_HASHING_INSTALL_DIR}/src/include" PATH "Path to
robin-hood-hashing/src/include")
- endif()
-
- if(BUILD_LAYERS OR BUILD_TESTS)
-@@ -370,7 +372,7 @@ target_include_directories(VkLayer_utils
- ${VulkanHeaders_INCLUDE_DIR})
-
- if (USE_ROBIN_HOOD_HASHING)
-- target_link_libraries(VkLayer_utils PUBLIC robin_hood::robin_hood)
-+ target_include_directories(VkLayer_utils PUBLIC
${ROBIN_HOOD_HASHING_INCLUDE_DIR})
- target_compile_definitions(VkLayer_utils PUBLIC USE_ROBIN_HOOD_HASHING)
- endif()
-
Index: vulkan-validation-layers/patches/patch-layers_CMakeLists_txt
===================================================================
RCS file: vulkan-validation-layers/patches/patch-layers_CMakeLists_txt
diff -N vulkan-validation-layers/patches/patch-layers_CMakeLists_txt
--- vulkan-validation-layers/patches/patch-layers_CMakeLists_txt 11 Mar
2022 19:23:31 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-include build dir before VulkanHeaders_INCLUDE_DIR
-
-Index: layers/CMakeLists.txt
---- layers/CMakeLists.txt.orig
-+++ layers/CMakeLists.txt
-@@ -107,7 +107,7 @@ macro(AddVkLayer target LAYER_COMPILE_DEFINITIONS)
- install(TARGETS VkLayer_${target} DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endmacro()
-
--include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/generated ${VulkanHeaders_INCLUDE_DIR})
-+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/generated ${VulkanHeaders_INCLUDE_DIR})
-
- if(MSVC)
- # Applies to all configurations
Index: vulkan-validation-layers/patches/patch-layers_vk_loader_platform_h
===================================================================
RCS file: vulkan-validation-layers/patches/patch-layers_vk_loader_platform_h
diff -N vulkan-validation-layers/patches/patch-layers_vk_loader_platform_h
--- vulkan-validation-layers/patches/patch-layers_vk_loader_platform_h 11 Mar
2022 19:23:31 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-Index: layers/vk_loader_platform.h
---- layers/vk_loader_platform.h.orig
-+++ layers/vk_loader_platform.h
-@@ -33,7 +33,7 @@
- #undef NOMINMAX
- #include "vulkan/vk_sdk_platform.h"
-
--#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
-+#if defined(__unix__) || defined(__APPLE__) || defined(__FreeBSD__)
- /* Linux-specific common code: */
-
- // Headers:
-@@ -145,7 +145,7 @@ static inline void loader_platform_thread_cond_broadca
-
- #define loader_stack_alloc(size) alloca(size)
-
--#elif defined(_WIN32) // defined(__linux__)
-+#elif defined(_WIN32) // defined(__unix__)
- /* Windows-specific common code: */
- // WinBase.h defines CreateSemaphore and synchapi.h defines CreateEvent
- // undefine them to avoid conflicts with VkLayerDispatchTable struct members.
Index: vulkan-validation-layers/patches/patch-layers_vk_mem_alloc_h
===================================================================
RCS file:
/cvs/ports/graphics/vulkan-validation-layers/patches/patch-layers_vk_mem_alloc_h,v
retrieving revision 1.5
diff -u -p -r1.5 patch-layers_vk_mem_alloc_h
--- vulkan-validation-layers/patches/patch-layers_vk_mem_alloc_h 30 Oct
2022 22:51:57 -0000 1.5
+++ vulkan-validation-layers/patches/patch-layers_vk_mem_alloc_h 5 Feb
2023 22:23:00 -0000
@@ -1,7 +1,7 @@
Index: layers/vk_mem_alloc.h
--- layers/vk_mem_alloc.h.orig
+++ layers/vk_mem_alloc.h
-@@ -2700,7 +2700,7 @@ static void* vma_aligned_alloc(size_t alignment, size_
+@@ -2703,7 +2703,7 @@ static void* vma_aligned_alloc(size_t alignment, size_
return memalign(alignment, size);
}
Index: vulkan-validation-layers/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/vulkan-validation-layers/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- vulkan-validation-layers/pkg/PLIST 11 Mar 2022 19:23:31 -0000 1.3
+++ vulkan-validation-layers/pkg/PLIST 5 Feb 2023 22:23:00 -0000
@@ -1,5 +1,4 @@
@so lib/libVkLayer_khronos_validation.so
-@static-lib lib/libVkLayer_utils.a
share/vulkan/
share/vulkan/explicit_layer.d/
share/vulkan/explicit_layer.d/VkLayer_khronos_validation.json
