Hi,
An update to the latest Vulkan SDK 1.2.189.1 and associated ports
(glslang, spirv-*). I built the whole suite and tested with vkcube
(from vulkan-tools), vulkaninfo (same), vkquake, and Cryptark via
fnaify with `/gldevice:Vulkan`. Basic runtime and also with
VK_INSTANCE_LAYERS=VK_LAYER_KHRONOS_validation. Everything works
including appropriate complaints from the validation layers in vkquake
and Cryptark. No symbol changes to libvulkan, so no shared object bump.
Fullscreen with vkquake seemed buggy though, but that is most likely a
vkquake and not a vulkan issue, as the other apps ran fine in
fullscreen.
I tested on Intel i7-10700 with integrated UHD 630 GPU again. As usual,
a test with amdgpu would be welcome.
ok?
Index: glslang/Makefile
===================================================================
RCS file: /cvs/ports/graphics/glslang/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- glslang/Makefile 29 Jun 2021 03:48:20 -0000 1.8
+++ glslang/Makefile 14 Oct 2021 21:11:08 -0000
@@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.8 2021/06/29 03:48:20 thfr Exp $
-PORTROACH = ^[0-9]
+PORTROACH = limit:^[0-9]
COMMENT = reference front-end for GLSL and ESSL
-GH_TAGNAME = 11.5.0
+GH_TAGNAME = 11.6.0
GH_ACCOUNT = KhronosGroup
GH_PROJECT = glslang
Index: glslang/distinfo
===================================================================
RCS file: /cvs/ports/graphics/glslang/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- glslang/distinfo 29 Jun 2021 03:48:20 -0000 1.3
+++ glslang/distinfo 14 Oct 2021 21:11:08 -0000
@@ -1,2 +1,2 @@
-SHA256 (glslang-11.5.0.tar.gz) = /QteO9pZG7CL0wSWVamaClXw3kBZucj3s5fksZz11R8=
-SIZE (glslang-11.5.0.tar.gz) = 3373042
+SHA256 (glslang-11.6.0.tar.gz) = mezToMLCIZKT12cjhG92Kp8+fdDcKk80bQ/DoFoM4AA=
+SIZE (glslang-11.6.0.tar.gz) = 3419655
Index: spirv-headers/Makefile
===================================================================
RCS file: /cvs/ports/graphics/spirv-headers/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- spirv-headers/Makefile 29 Jun 2021 03:48:20 -0000 1.5
+++ spirv-headers/Makefile 14 Oct 2021 21:11:08 -0000
@@ -2,9 +2,9 @@
COMMENT = SPIRV-Headers
-DISTNAME = spirv-headers-1.5.4pl2
-# commit from 2021-06-23
-GH_COMMIT = f95c3b3761ee1b1903f54ae69b526ed6f0edc3b9
+DISTNAME = spirv-headers-1.5.4pl3
+# commit from 2021-10-07
+GH_COMMIT = 5ea2d62e8c0ddd9e2a7d0ca5e3f2335e09e5f408
GH_ACCOUNT = KhronosGroup
GH_PROJECT = SPIRV-Headers
Index: spirv-headers/distinfo
===================================================================
RCS file: /cvs/ports/graphics/spirv-headers/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- spirv-headers/distinfo 29 Jun 2021 03:48:20 -0000 1.4
+++ spirv-headers/distinfo 14 Oct 2021 21:11:08 -0000
@@ -1,2 +1,2 @@
-SHA256 (spirv-headers-1.5.4pl2-f95c3b37.tar.gz) =
LE1uATM72gU4C0p6J7L0GKT0WtBoImeTWRLoRVKNpek=
-SIZE (spirv-headers-1.5.4pl2-f95c3b37.tar.gz) = 413446
+SHA256 (spirv-headers-1.5.4pl3-5ea2d62e.tar.gz) =
WNYcWEKk9Ad42NufJoohafZe3m1DVoOrIrpf3xQLAJs=
+SIZE (spirv-headers-1.5.4pl3-5ea2d62e.tar.gz) = 415152
Index: spirv-headers/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/spirv-headers/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- spirv-headers/pkg/PLIST 29 Jun 2021 03:48:20 -0000 1.4
+++ spirv-headers/pkg/PLIST 14 Oct 2021 21:11:08 -0000
@@ -77,3 +77,4 @@ share/cmake/SPIRV-Headers/
share/cmake/SPIRV-Headers/SPIRV-HeadersConfig.cmake
share/cmake/SPIRV-Headers/SPIRV-HeadersConfigVersion.cmake
share/cmake/SPIRV-Headers/SPIRV-HeadersTargets.cmake
+share/pkgconfig/SPIRV-Headers.pc
Index: spirv-tools/Makefile
===================================================================
RCS file: /cvs/ports/graphics/spirv-tools/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- spirv-tools/Makefile 29 Jun 2021 03:48:20 -0000 1.8
+++ spirv-tools/Makefile 14 Oct 2021 21:11:08 -0000
@@ -2,11 +2,11 @@
COMMENT = API and commands for processing SPIR-V
-V = 2021.2pl0
+V = 2021.3
DISTNAME = spirv-tools-${V}
GH_ACCOUNT = KhronosGroup
GH_PROJECT = SPIRV-Tools
-GH_COMMIT = e065c482c6c98ef22900822d32a21df8c5473054
+GH_TAGNAME = v${V}
CATEGORIES = devel graphics
Index: spirv-tools/distinfo
===================================================================
RCS file: /cvs/ports/graphics/spirv-tools/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- spirv-tools/distinfo 29 Jun 2021 14:46:46 -0000 1.5
+++ spirv-tools/distinfo 14 Oct 2021 21:11:08 -0000
@@ -1,2 +1,2 @@
-SHA256 (spirv-tools-2021.2pl0-e065c482.tar.gz) =
zBY+8nin1a3d5BJ1VJ21yMCkDGxB8P5bBj9i0xxkzpw=
-SIZE (spirv-tools-2021.2pl0-e065c482.tar.gz) = 2631244
+SHA256 (spirv-tools-2021.3.tar.gz) =
trQZQSHugITGKyD41XTDL3ZuTpI33+YLBlizFtGcaxM=
+SIZE (spirv-tools-2021.3.tar.gz) = 2847869
Index: spirv-tools/patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/graphics/spirv-tools/patches/patch-CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-CMakeLists_txt
--- spirv-tools/patches/patch-CMakeLists_txt 7 Jul 2020 08:08:05 -0000
1.2
+++ spirv-tools/patches/patch-CMakeLists_txt 14 Oct 2021 21:11:08 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.2 202
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -53,6 +53,8 @@ elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Android")
+@@ -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)
Index: spirv-tools/patches/patch-source_print_cpp
===================================================================
RCS file: /cvs/ports/graphics/spirv-tools/patches/patch-source_print_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-source_print_cpp
--- spirv-tools/patches/patch-source_print_cpp 7 Jul 2020 08:08:05 -0000
1.2
+++ spirv-tools/patches/patch-source_print_cpp 14 Oct 2021 21:11:08 -0000
@@ -6,9 +6,9 @@ Index: source/print.cpp
@@ -16,7 +16,8 @@
#if defined(SPIRV_ANDROID) || defined(SPIRV_LINUX) || defined(SPIRV_MAC) || \
- defined(SPIRV_IOS) || defined(SPIRV_FREEBSD) || \
+ defined(SPIRV_IOS) || defined(SPIRV_TVOS) || defined(SPIRV_FREEBSD) || \
- defined(SPIRV_EMSCRIPTEN) || defined(SPIRV_FUCHSIA)
-+ defined(SPIRV_EMSCRIPTEN) || defined(SPIRV_FUCHSIA) || \
++ defined(SPIRV_EMSCRIPTEN) || defined(SPIRV_FUCHSIA) || \
+ defined(SPIRV_OPENBSD)
namespace spvtools {
Index: spirv-tools/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/spirv-tools/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- spirv-tools/pkg/PLIST 7 Jul 2020 08:08:05 -0000 1.2
+++ spirv-tools/pkg/PLIST 14 Oct 2021 21:11:08 -0000
@@ -4,6 +4,7 @@
@bin bin/spirv-dis
bin/spirv-lesspipe.sh
@bin bin/spirv-link
+@bin bin/spirv-lint
@bin bin/spirv-opt
@bin bin/spirv-reduce
@bin bin/spirv-val
@@ -19,6 +20,10 @@ 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}
lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkTargets.cmake
+lib/cmake/SPIRV-Tools-lint/
+lib/cmake/SPIRV-Tools-lint/SPIRV-Tools-lintConfig.cmake
+lib/cmake/SPIRV-Tools-lint/SPIRV-Tools-lintTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/SPIRV-Tools-lint/SPIRV-Tools-lintTargets.cmake
lib/cmake/SPIRV-Tools-opt/
lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optConfig.cmake
lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optTargets${MODCMAKE_BUILD_SUFFIX}
@@ -31,6 +36,7 @@ lib/cmake/SPIRV-Tools/SPIRV-ToolsConfig.
lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget${MODCMAKE_BUILD_SUFFIX}
lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake
@static-lib lib/libSPIRV-Tools-link.a
+@static-lib lib/libSPIRV-Tools-lint.a
@static-lib lib/libSPIRV-Tools-opt.a
@static-lib lib/libSPIRV-Tools-reduce.a
@so lib/libSPIRV-Tools-shared.so
Index: vulkan-headers/Makefile
===================================================================
RCS file: /cvs/ports/graphics/vulkan-headers/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- vulkan-headers/Makefile 29 Jun 2021 03:48:21 -0000 1.6
+++ vulkan-headers/Makefile 14 Oct 2021 21:11:08 -0000
@@ -2,9 +2,9 @@
COMMENT = Vulkan header files
-V = 1.2.176.1
+V = 1.2.189.1
PKGNAME = vulkan-headers-${V}
-GH_TAGNAME = sdk.${V}-TAG
+GH_TAGNAME = sdk-${V}
GH_ACCOUNT = KhronosGroup
GH_PROJECT = Vulkan-Headers
Index: vulkan-headers/distinfo
===================================================================
RCS file: /cvs/ports/graphics/vulkan-headers/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- vulkan-headers/distinfo 29 Jun 2021 03:48:21 -0000 1.4
+++ vulkan-headers/distinfo 14 Oct 2021 21:11:08 -0000
@@ -1,2 +1,2 @@
-SHA256 (Vulkan-Headers-sdk.1.2.176.1-TAG.tar.gz) =
4EIPz9WlR5w7oUA4GhV+XZeSsJiD+MHZfHfY3SOdpz4=
-SIZE (Vulkan-Headers-sdk.1.2.176.1-TAG.tar.gz) = 1030757
+SHA256 (Vulkan-Headers-sdk-1.2.189.1.tar.gz) =
zi61mV3d2P8s7ol6uRwwo11gltWZb8kc7EK/s3ES0/g=
+SIZE (Vulkan-Headers-sdk-1.2.189.1.tar.gz) = 1191244
Index: vulkan-headers/patches/patch-include_vulkan_vulkan_hpp
===================================================================
RCS file: vulkan-headers/patches/patch-include_vulkan_vulkan_hpp
diff -N vulkan-headers/patches/patch-include_vulkan_vulkan_hpp
--- vulkan-headers/patches/patch-include_vulkan_vulkan_hpp 29 Jun 2021
03:48:21 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,59 +0,0 @@
-$OpenBSD: patch-include_vulkan_vulkan_hpp,v 1.3 2021/06/29 03:48:21 thfr Exp $
-
-Index: include/vulkan/vulkan.hpp
---- include/vulkan/vulkan.hpp.orig
-+++ include/vulkan/vulkan.hpp
-@@ -67,7 +67,7 @@
- #endif
-
- #if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1
--# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ )
|| defined( __Fuchsia__ )
-+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) ||
defined( __Fuchsia__ )
- # include <dlfcn.h>
- # elif defined( _WIN32 )
- typedef struct HINSTANCE__ * HINSTANCE;
-@@ -121385,7 +121385,7 @@ namespace VULKAN_HPP_NAMESPACE
- {
- if ( !vulkanLibraryName.empty() )
- {
--# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ )
|| defined( __Fuchsia__ )
-+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) ||
defined( __Fuchsia__ )
- m_library = dlopen( vulkanLibraryName.c_str(), RTLD_NOW | RTLD_LOCAL
);
- # elif defined( _WIN32 )
- m_library = ::LoadLibraryA( vulkanLibraryName.c_str() );
-@@ -121395,7 +121395,7 @@ namespace VULKAN_HPP_NAMESPACE
- }
- else
- {
--# if defined( __linux__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ )
-+# if defined( __unix__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ )
- m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL );
- if ( m_library == nullptr )
- {
-@@ -121439,7 +121439,7 @@ namespace VULKAN_HPP_NAMESPACE
- {
- if ( m_library )
- {
--# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ )
|| defined( __Fuchsia__ )
-+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) ||
defined( __Fuchsia__ )
- dlclose( m_library );
- # elif defined( _WIN32 )
- ::FreeLibrary( m_library );
-@@ -121452,7 +121452,7 @@ namespace VULKAN_HPP_NAMESPACE
- template <typename T>
- T getProcAddress( const char * function ) const VULKAN_HPP_NOEXCEPT
- {
--# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ )
|| defined( __Fuchsia__ )
-+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) ||
defined( __Fuchsia__ )
- return (T)dlsym( m_library, function );
- # elif defined( _WIN32 )
- return ( T )::GetProcAddress( m_library, function );
-@@ -121467,7 +121467,7 @@ namespace VULKAN_HPP_NAMESPACE
- }
-
- private:
--# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ )
|| defined( __Fuchsia__ )
-+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) ||
defined( __Fuchsia__ )
- void * m_library;
- # elif defined( _WIN32 )
- ::HINSTANCE m_library;
Index: vulkan-headers/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/vulkan-headers/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- vulkan-headers/pkg/PLIST 29 Jun 2021 03:48:21 -0000 1.4
+++ vulkan-headers/pkg/PLIST 14 Oct 2021 21:11:08 -0000
@@ -17,12 +17,17 @@ include/vulkan/vulkan_android.h
include/vulkan/vulkan_beta.h
include/vulkan/vulkan_core.h
include/vulkan/vulkan_directfb.h
+include/vulkan/vulkan_enums.hpp
include/vulkan/vulkan_fuchsia.h
+include/vulkan/vulkan_funcs.hpp
include/vulkan/vulkan_ggp.h
+include/vulkan/vulkan_handles.hpp
include/vulkan/vulkan_ios.h
include/vulkan/vulkan_macos.h
include/vulkan/vulkan_metal.h
+include/vulkan/vulkan_raii.hpp
include/vulkan/vulkan_screen.h
+include/vulkan/vulkan_structs.hpp
include/vulkan/vulkan_vi.h
include/vulkan/vulkan_wayland.h
include/vulkan/vulkan_win32.h
Index: vulkan-loader/Makefile
===================================================================
RCS file: /cvs/ports/graphics/vulkan-loader/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- vulkan-loader/Makefile 29 Jun 2021 03:48:21 -0000 1.12
+++ vulkan-loader/Makefile 14 Oct 2021 21:11:08 -0000
@@ -2,9 +2,9 @@
COMMENT = Vulkan ICD loader
-V = 1.2.176.1
+V = 1.2.189.1
PKGNAME = vulkan-loader-${V}
-GH_TAGNAME = sdk.${V}-TAG
+GH_TAGNAME = sdk-${V}
GH_ACCOUNT = KhronosGroup
GH_PROJECT = Vulkan-Loader
Index: vulkan-loader/distinfo
===================================================================
RCS file: /cvs/ports/graphics/vulkan-loader/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- vulkan-loader/distinfo 29 Jun 2021 03:48:21 -0000 1.4
+++ vulkan-loader/distinfo 14 Oct 2021 21:11:08 -0000
@@ -1,2 +1,2 @@
-SHA256 (Vulkan-Loader-sdk.1.2.176.1-TAG.tar.gz) =
me56ioAWDR4zPiEd55z2oOOO6EY5zyvC68eTHOgLG2o=
-SIZE (Vulkan-Loader-sdk.1.2.176.1-TAG.tar.gz) = 1430372
+SHA256 (Vulkan-Loader-sdk-1.2.189.1.tar.gz) =
HZ9TkVTTfOoMozY0HDsl5z1aUyDy+cnFX4MJQi/m7Dw=
+SIZE (Vulkan-Loader-sdk-1.2.189.1.tar.gz) = 1509572
Index: vulkan-loader/patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/graphics/vulkan-loader/patches/patch-CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -r1.5 patch-CMakeLists_txt
--- vulkan-loader/patches/patch-CMakeLists_txt 29 Jun 2021 03:48:21 -0000
1.5
+++ vulkan-loader/patches/patch-CMakeLists_txt 14 Oct 2021 21:11:08 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.5 202
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -98,13 +98,13 @@ set(LOADER_HELPER_FOLDER "Helper Targets")
+@@ -100,13 +100,13 @@ set(LOADER_HELPER_FOLDER "Helper Targets")
if(UNIX)
set(
@@ -19,7 +19,7 @@ Index: CMakeLists.txt
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."
-@@ -126,6 +126,7 @@ if(UNIX AND NOT APPLE) # i.e.: Linux
+@@ -128,6 +128,7 @@ if(UNIX AND NOT APPLE) # i.e.: Linux
if(BUILD_WSI_XCB_SUPPORT)
find_package(XCB REQUIRED)
Index: vulkan-loader/patches/patch-loader_CMakeLists_txt
===================================================================
RCS file:
/cvs/ports/graphics/vulkan-loader/patches/patch-loader_CMakeLists_txt,v
retrieving revision 1.6
diff -u -p -r1.6 patch-loader_CMakeLists_txt
--- vulkan-loader/patches/patch-loader_CMakeLists_txt 29 Jun 2021 03:48:21
-0000 1.6
+++ vulkan-loader/patches/patch-loader_CMakeLists_txt 14 Oct 2021 21:11:08
-0000
@@ -15,7 +15,7 @@ Index: loader/CMakeLists.txt
# Check for the existance of the secure_getenv or __secure_getenv commands
include(CheckFunctionExists)
-@@ -197,7 +197,6 @@ else(UNIX AND NOT APPLE) # i.e.: Linux
+@@ -202,7 +202,6 @@ else(UNIX AND NOT APPLE) # i.e.: Linux
target_link_libraries(asm_offset Vulkan::Headers)
add_custom_command(OUTPUT gen_defines.asm DEPENDS asm_offset COMMAND
asm_offset GAS)
add_custom_target(loader_asm_gen_files DEPENDS gen_defines.asm)
@@ -23,7 +23,7 @@ Index: loader/CMakeLists.txt
else()
message(WARNING "Could not find working x86 GAS
assembler\n${ASM_FAILURE_MSG}")
set(OPT_LOADER_SRCS ${OPT_LOADER_SRCS} unknown_ext_chain.c)
-@@ -297,7 +296,7 @@ else()
+@@ -300,7 +299,7 @@ else()
add_library(vulkan-framework SHARED ${NORMAL_LOADER_SRCS}
${OPT_LOADER_SRCS} ${FRAMEWORK_HEADERS})
endif()
add_dependencies(vulkan-framework loader_asm_gen_files)
@@ -32,7 +32,7 @@ Index: loader/CMakeLists.txt
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
-@@ -322,9 +321,6 @@ else()
+@@ -325,9 +324,6 @@ else()
# cmake-format: on
endif()
Index: vulkan-loader/patches/patch-loader_loader_c
===================================================================
RCS file: /cvs/ports/graphics/vulkan-loader/patches/patch-loader_loader_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-loader_loader_c
--- vulkan-loader/patches/patch-loader_loader_c 29 Jun 2021 03:48:21 -0000
1.4
+++ vulkan-loader/patches/patch-loader_loader_c 14 Oct 2021 21:11:08 -0000
@@ -6,16 +6,16 @@ fix vulkaninfo
Index: loader/loader.c
--- loader/loader.c.orig
+++ loader/loader.c
-@@ -253,7 +253,7 @@ void *loader_device_heap_realloc(const struct loader_d
+@@ -248,7 +248,7 @@ void *loader_device_heap_realloc(const struct loader_d
}
// Environment variables
-#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) ||
defined(__QNXNTO__)
+#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) ||
defined(__QNXNTO__)
- static inline bool IsHighIntegrity() {
- return geteuid() != getuid() || getegid() != getgid();
-@@ -7559,53 +7559,11 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_EnumerateDev
+ static inline bool IsHighIntegrity() { return geteuid() != getuid() ||
getegid() != getgid(); }
+
+@@ -7550,52 +7550,11 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_EnumerateDev
struct loader_extension_list all_exts = {0};
struct loader_extension_list icd_exts = {0};
@@ -60,9 +60,8 @@ Index: loader/loader.c
- return VK_INCOMPLETE;
- }
- } else {
-- loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0,
-- "vkEnumerateDeviceExtensionProperties: pLayerName "
-- "is too long or is badly formed");
+- loader_log(inst, VULKAN_LOADER_ERROR_BIT, 0,
+- "vkEnumerateDeviceExtensionProperties: pLayerName is
too long or is badly formed");
- return VK_ERROR_EXTENSION_NOT_PRESENT;
- }
-
Index: vulkan-loader/patches/patch-loader_trampoline_c
===================================================================
RCS file: /cvs/ports/graphics/vulkan-loader/patches/patch-loader_trampoline_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-loader_trampoline_c
--- vulkan-loader/patches/patch-loader_trampoline_c 7 Jul 2020 08:08:07
-0000 1.2
+++ vulkan-loader/patches/patch-loader_trampoline_c 14 Oct 2021 21:11:08
-0000
@@ -6,7 +6,7 @@ fix vulkaninfo
Index: loader/trampoline.c
--- loader/trampoline.c.orig
+++ loader/trampoline.c
-@@ -801,17 +801,61 @@ LOADER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumera
+@@ -811,17 +811,61 @@ LOADER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumera
VkExtensionProperties *pProperties) {
VkResult res = VK_SUCCESS;
struct loader_physical_device_tramp *phys_dev;
Index: vulkan-tools/Makefile
===================================================================
RCS file: /cvs/ports/graphics/vulkan-tools/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- vulkan-tools/Makefile 29 Jun 2021 03:48:21 -0000 1.8
+++ vulkan-tools/Makefile 14 Oct 2021 21:11:08 -0000
@@ -2,9 +2,9 @@
COMMENT = Vulkan Utilities and Tools
-V = 1.2.176.1
+V = 1.2.189.1
PKGNAME = vulkan-tools-${V}
-GH_TAGNAME = sdk.${V}-TAG
+GH_TAGNAME = sdk-${V}
GH_ACCOUNT = KhronosGroup
GH_PROJECT = Vulkan-Tools
Index: vulkan-tools/distinfo
===================================================================
RCS file: /cvs/ports/graphics/vulkan-tools/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- vulkan-tools/distinfo 29 Jun 2021 03:48:21 -0000 1.4
+++ vulkan-tools/distinfo 14 Oct 2021 21:11:08 -0000
@@ -1,2 +1,2 @@
-SHA256 (Vulkan-Tools-sdk.1.2.176.1-TAG.tar.gz) =
E17nVXDEDEJE/QGRm3uiT4YcdtqGE8xZWK/7eDTVM3k=
-SIZE (Vulkan-Tools-sdk.1.2.176.1-TAG.tar.gz) = 841300
+SHA256 (Vulkan-Tools-sdk-1.2.189.1.tar.gz) =
712wk0/3GSZXu/xnX24+HuAJ8q00qrkV0r2Zk6Wa3YE=
+SIZE (Vulkan-Tools-sdk-1.2.189.1.tar.gz) = 849117
Index: vulkan-tools/patches/patch-cube_cube_cpp
===================================================================
RCS file: /cvs/ports/graphics/vulkan-tools/patches/patch-cube_cube_cpp,v
retrieving revision 1.4
diff -u -p -r1.4 patch-cube_cube_cpp
--- vulkan-tools/patches/patch-cube_cube_cpp 29 Jun 2021 03:48:22 -0000
1.4
+++ vulkan-tools/patches/patch-cube_cube_cpp 14 Oct 2021 21:11:08 -0000
@@ -3,12 +3,12 @@ $OpenBSD: patch-cube_cube_cpp,v 1.4 2021
Index: cube/cube.cpp
--- cube/cube.cpp.orig
+++ cube/cube.cpp
-@@ -3194,7 +3194,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPre
+@@ -3256,7 +3256,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPre
return (int)msg.wParam;
}
--#elif __linux__
-+#elif defined(__linux__) || defined(__unix__)
+-#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-vulkaninfo_vulkaninfo_h
===================================================================
RCS file:
/cvs/ports/graphics/vulkan-tools/patches/patch-vulkaninfo_vulkaninfo_h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-vulkaninfo_vulkaninfo_h
--- vulkan-tools/patches/patch-vulkaninfo_vulkaninfo_h 27 Dec 2020 15:58:43
-0000 1.2
+++ vulkan-tools/patches/patch-vulkaninfo_vulkaninfo_h 14 Oct 2021 21:11:08
-0000
@@ -3,54 +3,53 @@ $OpenBSD: patch-vulkaninfo_vulkaninfo_h,
Index: vulkaninfo/vulkaninfo.h
--- vulkaninfo/vulkaninfo.h.orig
+++ vulkaninfo/vulkaninfo.h
-@@ -66,7 +66,11 @@
+@@ -66,7 +66,7 @@
#endif
#endif // _WIN32
--#if defined(__linux__) || defined(__APPLE__)
-+#if defined(__unix__) && !defined(__APPLE__)
-+#define USE_DLOPEN 1
-+#endif
-+
-+#if defined(USE_DLOPEN)
+-#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
++#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) ||
defined(__OpenBSD__)
#include <dlfcn.h>
#endif
-@@ -262,8 +266,11 @@ auto GetVector(const char *func_name, F &&f, Ts &&...
+@@ -262,7 +262,7 @@ auto GetVector(const char *func_name, F &&f, Ts &&...
// ----------- Instance Setup ------- //
struct VkDll {
VkResult Initialize() {
--#if defined(__linux__)
-+#if defined(__OpenBSD__)
+-#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", RTLD_NOW | RTLD_LOCAL);
-+#elif defined(USE_DLOPEN)
-+ library = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL);
if (!library) library = dlopen("libvulkan.so.1", RTLD_NOW |
RTLD_LOCAL);
#elif defined(_WIN32)
- library = LoadLibrary(TEXT("vulkan-1.dll"));
-@@ -274,7 +281,7 @@ struct VkDll {
+@@ -274,7 +274,7 @@ struct VkDll {
return VK_SUCCESS;
}
void Close() {
--#if defined(__linux__)
-+#if defined(USE_DLOPEN)
+-#if defined(__linux__) || defined(__FreeBSD__)
++#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
dlclose(library);
#elif defined(_WIN32)
FreeLibrary(library);
-@@ -449,13 +456,13 @@ struct VkDll {
+@@ -429,13 +429,13 @@ struct VkDll {
private:
template <typename T>
void Load(T &func_dest, const char *func_name) {
--#if defined(__linux__)
-+#if defined(USE_DLOPEN)
+-#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__)
-+#if defined(USE_DLOPEN)
+-#if defined(__linux__) || defined(__FreeBSD__)
++#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
void *library;
#elif defined(_WIN32)
HMODULE library;
+@@ -1753,4 +1753,4 @@ std::unordered_map<PropFlags, std::vector<VkFormat>> F
+ }
+ }
+ return map;
+-}
+\ No newline at end of file
++}
Index: vulkan-validation-layers/Makefile
===================================================================
RCS file: /cvs/ports/graphics/vulkan-validation-layers/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- vulkan-validation-layers/Makefile 29 Jun 2021 03:48:22 -0000 1.8
+++ vulkan-validation-layers/Makefile 14 Oct 2021 21:11:08 -0000
@@ -2,9 +2,9 @@
COMMENT = Vulkan Validation Layers
-V = 1.2.176.1
+V = 1.2.189.1
PKGNAME = vulkan-validation-layers-${V}
-GH_TAGNAME = sdk.${V}-TAG
+GH_TAGNAME = sdk-${V}
GH_ACCOUNT = KhronosGroup
GH_PROJECT = Vulkan-ValidationLayers
Index: vulkan-validation-layers/distinfo
===================================================================
RCS file: /cvs/ports/graphics/vulkan-validation-layers/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- vulkan-validation-layers/distinfo 29 Jun 2021 03:48:22 -0000 1.4
+++ vulkan-validation-layers/distinfo 14 Oct 2021 21:11:08 -0000
@@ -1,2 +1,2 @@
-SHA256 (Vulkan-ValidationLayers-sdk.1.2.176.1-TAG.tar.gz) =
PuzAbOS3cxYOYCSsGEoOeT68cx3R6gtnXlbg8EXlDuQ=
-SIZE (Vulkan-ValidationLayers-sdk.1.2.176.1-TAG.tar.gz) = 2709276
+SHA256 (Vulkan-ValidationLayers-sdk-1.2.189.1.tar.gz) =
0Wmuca47oSFZ3zVbWPhvVjUGLGldHerJuX1WU1YdUX0=
+SIZE (Vulkan-ValidationLayers-sdk-1.2.189.1.tar.gz) = 3403465
Index: vulkan-validation-layers/patches/patch-CMakeLists_txt
===================================================================
RCS file:
/cvs/ports/graphics/vulkan-validation-layers/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-CMakeLists_txt
--- vulkan-validation-layers/patches/patch-CMakeLists_txt 29 Jun 2021
03:48:22 -0000 1.3
+++ vulkan-validation-layers/patches/patch-CMakeLists_txt 14 Oct 2021
21:11:08 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.3 202
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -100,6 +100,7 @@ if(UNIX AND NOT APPLE) # i.e. Linux
+@@ -156,6 +156,7 @@ if(UNIX AND NOT APPLE) # i.e. Linux
if(BUILD_WSI_XCB_SUPPORT)
find_package(XCB REQUIRED)
Index: vulkan-validation-layers/patches/patch-layers_CMakeLists_txt
===================================================================
RCS file:
/cvs/ports/graphics/vulkan-validation-layers/patches/patch-layers_CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-layers_CMakeLists_txt
--- vulkan-validation-layers/patches/patch-layers_CMakeLists_txt 29 Jun
2021 03:48:22 -0000 1.3
+++ vulkan-validation-layers/patches/patch-layers_CMakeLists_txt 14 Oct
2021 21:11:08 -0000
@@ -5,7 +5,7 @@ include build dir before VulkanHeaders_I
Index: layers/CMakeLists.txt
--- layers/CMakeLists.txt.orig
+++ layers/CMakeLists.txt
-@@ -101,7 +101,7 @@ macro(AddVkLayer target LAYER_COMPILE_DEFINITIONS)
+@@ -107,7 +107,7 @@ macro(AddVkLayer target LAYER_COMPILE_DEFINITIONS)
install(TARGETS VkLayer_${target} DESTINATION ${CMAKE_INSTALL_LIBDIR})
endmacro()
