Hi, This is a diff to update the ports for vulkan to the latest SDK release 1.2.176.1 from April. I've updated them and tested without issues with vkcube and vulkaninfo (both from the vulkan-tools port), as well as vkquake and the FNA game Cryptark with "fnaify /gldevice:Vulkan".
I tested vkquake with validation layers: $ VK_INSTANCE_LAYERS=VK_LAYER_KHRONOS_validation vkquake This seems to work and lists one error on start [1]. A few notes on this update: - For some reason, upstream named this "1.2.176.1-TAG". As versioning has since progressed to 1.2.182 for non-SDK releases, I'm not including the "-TAG". - All glslang tests succeed (this is the only one with working tests). - spirv-headers: use recent commit as no release tag since November 2020; version it as "1.5.4pl2" because there have been 2 patch tags for 1.5.4 ("1.5.4.raytracing" and "1.5.4.raytracing.fixed"). - spirv-tools: v2021.2 fails to build because of missing SPV_OPERAND_TYPE_OPTIONAL_PACKED_VECTOR_FORMAT; therefore using recent commit (2021.2pl20210623 from June 23rd). - vulkan-loader: remove BROKEN-i386 per the comment (was for clang < 9.0.0) - vulkan-validation-layers: upstream defaults now to using "Robin Hood Hashing." I haven't heard of this before; but per BUILD.md, this would require a port of https://github.com/martinus/robin-hood-hashing. Disable this for now; we can figure out this out later and then enable. Tested on Intel i7-10700 with the integrated UHD 630 GPU. Testing with amdgpu would be appreciated. ok? Comments? [1] https://pbot.rmdir.de/xH5If3alG8VUNx5qtIZfUA Index: glslang/Makefile =================================================================== RCS file: /cvs/ports/graphics/glslang/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- glslang/Makefile 23 Feb 2021 19:39:25 -0000 1.7 +++ glslang/Makefile 26 Jun 2021 21:33:58 -0000 @@ -4,8 +4,7 @@ PORTROACH = ^[0-9] COMMENT = reference front-end for GLSL and ESSL -REVISION = 0 -GH_TAGNAME = 8.13.3743 +GH_TAGNAME = 11.5.0 GH_ACCOUNT = KhronosGroup GH_PROJECT = glslang Index: glslang/distinfo =================================================================== RCS file: /cvs/ports/graphics/glslang/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- glslang/distinfo 7 Jul 2020 08:08:03 -0000 1.2 +++ glslang/distinfo 26 Jun 2021 21:33:58 -0000 @@ -1,2 +1,2 @@ -SHA256 (glslang-8.13.3743.tar.gz) = Y56+xW8adALy+glEaaXd6h7O7Pry6e/jYTdqD3On7i8= -SIZE (glslang-8.13.3743.tar.gz) = 3183453 +SHA256 (glslang-11.5.0.tar.gz) = /QteO9pZG7CL0wSWVamaClXw3kBZucj3s5fksZz11R8= +SIZE (glslang-11.5.0.tar.gz) = 3373042 Index: glslang/pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/glslang/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- glslang/pkg/PLIST 7 Jul 2020 08:08:04 -0000 1.2 +++ glslang/pkg/PLIST 26 Jun 2021 21:33:58 -0000 @@ -1,25 +1,16 @@ @comment $OpenBSD: PLIST,v 1.2 2020/07/07 08:08:04 thfr Exp $ @bin bin/glslangValidator @bin bin/spirv-remap -include/SPIRV/ -include/SPIRV/GLSL.ext.AMD.h -include/SPIRV/GLSL.ext.EXT.h -include/SPIRV/GLSL.ext.KHR.h -include/SPIRV/GLSL.ext.NV.h -include/SPIRV/GLSL.std.450.h -include/SPIRV/GlslangToSpv.h -include/SPIRV/Logger.h -include/SPIRV/NonSemanticDebugPrintf.h -include/SPIRV/SPVRemapper.h -include/SPIRV/SpvBuilder.h -include/SPIRV/SpvTools.h -include/SPIRV/bitutils.h -include/SPIRV/disassemble.h -include/SPIRV/doc.h -include/SPIRV/hex_float.h -include/SPIRV/spirv.hpp -include/SPIRV/spvIR.h include/glslang/ +include/glslang/HLSL/ +include/glslang/HLSL/hlslAttributes.h +include/glslang/HLSL/hlslGrammar.h +include/glslang/HLSL/hlslOpMap.h +include/glslang/HLSL/hlslParseHelper.h +include/glslang/HLSL/hlslParseables.h +include/glslang/HLSL/hlslScanContext.h +include/glslang/HLSL/hlslTokenStream.h +include/glslang/HLSL/hlslTokens.h include/glslang/Include/ include/glslang/Include/BaseTypes.h include/glslang/Include/Common.h @@ -29,12 +20,12 @@ include/glslang/Include/InitializeGlobal include/glslang/Include/PoolAlloc.h include/glslang/Include/ResourceLimits.h include/glslang/Include/ShHandle.h +include/glslang/Include/SpirvIntrinsics.h include/glslang/Include/Types.h include/glslang/Include/arrays.h include/glslang/Include/glslang_c_interface.h include/glslang/Include/glslang_c_shader_types.h include/glslang/Include/intermediate.h -include/glslang/Include/revision.h include/glslang/MachineIndependent/ include/glslang/MachineIndependent/Initialize.h include/glslang/MachineIndependent/LiveTraverser.h @@ -75,6 +66,7 @@ include/glslang/SPIRV/doc.h include/glslang/SPIRV/hex_float.h 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 @@ -86,15 +78,20 @@ lib/cmake/SPIRVTargets${MODCMAKE_BUILD_S 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 +@static-lib lib/libMachineIndependent.a @static-lib lib/libOGLCompiler.a @static-lib lib/libOSDependent.a @static-lib lib/libSPIRV.a @static-lib lib/libSPVRemapper.a +@static-lib lib/libglslang-default-resource-limits.a @static-lib lib/libglslang.a Index: spirv-headers/Makefile =================================================================== RCS file: /cvs/ports/graphics/spirv-headers/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- spirv-headers/Makefile 27 Dec 2020 15:58:42 -0000 1.4 +++ spirv-headers/Makefile 26 Jun 2021 21:33:58 -0000 @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.4 2020/12/27 15:58:42 thfr Exp $ +# $OpenBSD: Makefile,v 1.3 2020/07/07 08:08:04 thfr Exp $ COMMENT = SPIRV-Headers -V = 1.5.4.raytracing.fixed -PKGNAME = spirv-headers-1.5.4pl1 -GH_TAGNAME = ${V} +DISTNAME = spirv-headers-1.5.4pl2 +# commit from 2021-06-23 +GH_COMMIT = f95c3b3761ee1b1903f54ae69b526ed6f0edc3b9 GH_ACCOUNT = KhronosGroup GH_PROJECT = SPIRV-Headers Index: spirv-headers/distinfo =================================================================== RCS file: /cvs/ports/graphics/spirv-headers/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- spirv-headers/distinfo 27 Dec 2020 15:58:42 -0000 1.3 +++ spirv-headers/distinfo 26 Jun 2021 21:33:58 -0000 @@ -1,2 +1,2 @@ -SHA256 (SPIRV-Headers-1.5.4.raytracing.fixed.tar.gz) = 3yrSUgvk2VpHn6JIkhBliFu/Q1plg0mn/BZK17JraMY= -SIZE (SPIRV-Headers-1.5.4.raytracing.fixed.tar.gz) = 395500 +SHA256 (spirv-headers-1.5.4pl2-f95c3b37.tar.gz) = LE1uATM72gU4C0p6J7L0GKT0WtBoImeTWRLoRVKNpek= +SIZE (spirv-headers-1.5.4pl2-f95c3b37.tar.gz) = 413446 Index: spirv-headers/pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/spirv-headers/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- spirv-headers/pkg/PLIST 27 Dec 2020 15:58:42 -0000 1.3 +++ spirv-headers/pkg/PLIST 26 Jun 2021 21:33:58 -0000 @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.3 2020/12/27 15:58:42 thfr Exp $ +@comment $OpenBSD: PLIST,v 1.2 2020/07/07 08:08:05 thfr Exp $ include/spirv/ include/spirv/1.0/ include/spirv/1.0/GLSL.std.450.h @@ -49,12 +49,14 @@ include/spirv/unified1/DebugInfo.h include/spirv/unified1/GLSL.std.450.h include/spirv/unified1/NonSemanticClspvReflection.h include/spirv/unified1/NonSemanticDebugPrintf.h +include/spirv/unified1/NonSemanticShaderDebugInfo100.h include/spirv/unified1/OpenCL.std.h include/spirv/unified1/OpenCLDebugInfo100.h include/spirv/unified1/extinst.debuginfo.grammar.json include/spirv/unified1/extinst.glsl.std.450.grammar.json include/spirv/unified1/extinst.nonsemantic.clspvreflection.grammar.json include/spirv/unified1/extinst.nonsemantic.debugprintf.grammar.json +include/spirv/unified1/extinst.nonsemantic.shader.debuginfo.100.grammar.json include/spirv/unified1/extinst.opencl.debuginfo.100.grammar.json include/spirv/unified1/extinst.opencl.std.100.grammar.json include/spirv/unified1/extinst.spv-amd-gcn-shader.grammar.json @@ -70,8 +72,8 @@ include/spirv/unified1/spirv.json include/spirv/unified1/spirv.lua include/spirv/unified1/spirv.py include/spirv/unified1/spv.d -lib/cmake/ -lib/cmake/SPIRV-Headers/ -lib/cmake/SPIRV-Headers/SPIRV-HeadersConfig.cmake -lib/cmake/SPIRV-Headers/SPIRV-HeadersConfigVersion.cmake -lib/cmake/SPIRV-Headers/SPIRV-HeadersTargets.cmake +share/cmake/ +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 Index: spirv-tools/Makefile =================================================================== RCS file: /cvs/ports/graphics/spirv-tools/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- spirv-tools/Makefile 23 Feb 2021 19:39:26 -0000 1.7 +++ spirv-tools/Makefile 26 Jun 2021 21:33:58 -0000 @@ -2,11 +2,11 @@ COMMENT = API and commands for processing SPIR-V -V = 2020.6 +V = 2021.2pl20210623 DISTNAME = spirv-tools-${V} GH_ACCOUNT = KhronosGroup GH_PROJECT = SPIRV-Tools -GH_TAGNAME = v${V} +GH_COMMIT = e065c482c6c98ef22900822d32a21df8c5473054 CATEGORIES = devel graphics Index: spirv-tools/distinfo =================================================================== RCS file: /cvs/ports/graphics/spirv-tools/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- spirv-tools/distinfo 27 Dec 2020 15:58:42 -0000 1.3 +++ spirv-tools/distinfo 26 Jun 2021 21:33:58 -0000 @@ -1,2 +1,2 @@ -SHA256 (spirv-tools-2020.6.tar.gz) = 3iOSaC343vesZmoqMgzUdXUbrfR5CwHHORt2ROy1UKM= -SIZE (spirv-tools-2020.6.tar.gz) = 2595300 +SHA256 (spirv-tools-2021.2pl20210623-e065c482.tar.gz) = zBY+8nin1a3d5BJ1VJ21yMCkDGxB8P5bBj9i0xxkzpw= +SIZE (spirv-tools-2021.2pl20210623-e065c482.tar.gz) = 2631244 Index: vulkan-headers/Makefile =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- vulkan-headers/Makefile 27 Dec 2020 15:58:43 -0000 1.5 +++ vulkan-headers/Makefile 26 Jun 2021 21:33:58 -0000 @@ -2,9 +2,9 @@ COMMENT = Vulkan header files -V = 1.2.162.0 +V = 1.2.176.1 PKGNAME = vulkan-headers-${V} -GH_TAGNAME = sdk-${V} +GH_TAGNAME = sdk.${V}-TAG GH_ACCOUNT = KhronosGroup GH_PROJECT = Vulkan-Headers Index: vulkan-headers/distinfo =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- vulkan-headers/distinfo 27 Dec 2020 15:58:43 -0000 1.3 +++ vulkan-headers/distinfo 26 Jun 2021 21:33:58 -0000 @@ -1,2 +1,2 @@ -SHA256 (Vulkan-Headers-sdk-1.2.162.0.tar.gz) = 6w9qeaw44Tf1Wg4TZBFA5jt2XI7HF6Zb85BGFO91Q2U= -SIZE (Vulkan-Headers-sdk-1.2.162.0.tar.gz) = 853014 +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 Index: vulkan-headers/patches/patch-include_vulkan_vulkan_hpp =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/patches/patch-include_vulkan_vulkan_hpp,v retrieving revision 1.2 diff -u -p -r1.2 patch-include_vulkan_vulkan_hpp --- vulkan-headers/patches/patch-include_vulkan_vulkan_hpp 27 Dec 2020 15:58:43 -0000 1.2 +++ vulkan-headers/patches/patch-include_vulkan_vulkan_hpp 26 Jun 2021 21:33:58 -0000 @@ -7,53 +7,53 @@ Index: include/vulkan/vulkan.hpp #endif #if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1 --# if defined( __linux__ ) || defined( __APPLE__ ) -+# if defined( __unix__) || defined( __APPLE__ ) +-# 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; -@@ -92342,7 +92342,7 @@ namespace VULKAN_HPP_NAMESPACE +@@ -121385,7 +121385,7 @@ namespace VULKAN_HPP_NAMESPACE { if ( !vulkanLibraryName.empty() ) { --# if defined( __linux__ ) || defined( __APPLE__ ) -+# if defined( __unix__ ) || defined( __APPLE__ ) +-# 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() ); -@@ -92352,7 +92352,7 @@ namespace VULKAN_HPP_NAMESPACE +@@ -121395,7 +121395,7 @@ namespace VULKAN_HPP_NAMESPACE } else { --# if defined( __linux__ ) -+# if defined( __unix__ ) +-# 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 ) { -@@ -92395,7 +92395,7 @@ namespace VULKAN_HPP_NAMESPACE +@@ -121439,7 +121439,7 @@ namespace VULKAN_HPP_NAMESPACE { if ( m_library ) { --# if defined( __linux__ ) || defined( __APPLE__ ) -+# if defined( __unix__ ) || defined( __APPLE__ ) +-# 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 ); -@@ -92408,7 +92408,7 @@ namespace VULKAN_HPP_NAMESPACE +@@ -121452,7 +121452,7 @@ namespace VULKAN_HPP_NAMESPACE template <typename T> - T getProcAddress( const char* function ) const VULKAN_HPP_NOEXCEPT + T getProcAddress( const char * function ) const VULKAN_HPP_NOEXCEPT { --# if defined( __linux__ ) || defined( __APPLE__ ) -+# if defined( __unix__ ) || defined( __APPLE__ ) +-# 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 ); -@@ -92420,7 +92420,7 @@ namespace VULKAN_HPP_NAMESPACE - bool success() const VULKAN_HPP_NOEXCEPT { return m_library != nullptr; } + return ( T )::GetProcAddress( m_library, function ); +@@ -121467,7 +121467,7 @@ namespace VULKAN_HPP_NAMESPACE + } private: --# if defined( __linux__ ) || defined( __APPLE__ ) -+# if defined( __unix__ ) || defined( __APPLE__ ) +-# 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/patches/patch-registry_cgenerator_py =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/patches/patch-registry_cgenerator_py,v retrieving revision 1.2 diff -u -p -r1.2 patch-registry_cgenerator_py --- vulkan-headers/patches/patch-registry_cgenerator_py 7 Jul 2020 08:08:06 -0000 1.2 +++ vulkan-headers/patches/patch-registry_cgenerator_py 26 Jun 2021 21:33:58 -0000 @@ -7,5 +7,5 @@ Index: registry/cgenerator.py -#!/usr/bin/python3 -i +#!/usr/bin/env python3 -i # - # Copyright (c) 2013-2020 The Khronos Group Inc. + # Copyright 2013-2021 The Khronos Group Inc. # Index: vulkan-headers/patches/patch-registry_conventions_py =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/patches/patch-registry_conventions_py,v retrieving revision 1.2 diff -u -p -r1.2 patch-registry_conventions_py --- vulkan-headers/patches/patch-registry_conventions_py 7 Jul 2020 08:08:06 -0000 1.2 +++ vulkan-headers/patches/patch-registry_conventions_py 26 Jun 2021 21:33:58 -0000 @@ -7,5 +7,5 @@ Index: registry/conventions.py -#!/usr/bin/python3 -i +#!/usr/bin/env python3 -i # - # Copyright (c) 2013-2020 The Khronos Group Inc. + # Copyright 2013-2021 The Khronos Group Inc. # Index: vulkan-headers/patches/patch-registry_generator_py =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/patches/patch-registry_generator_py,v retrieving revision 1.2 diff -u -p -r1.2 patch-registry_generator_py --- vulkan-headers/patches/patch-registry_generator_py 7 Jul 2020 08:08:06 -0000 1.2 +++ vulkan-headers/patches/patch-registry_generator_py 26 Jun 2021 21:33:58 -0000 @@ -7,5 +7,5 @@ Index: registry/generator.py -#!/usr/bin/python3 -i +#!/usr/bin/env python3 -i # - # Copyright (c) 2013-2020 The Khronos Group Inc. + # Copyright 2013-2021 The Khronos Group Inc. # Index: vulkan-headers/patches/patch-registry_genvk_py =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/patches/patch-registry_genvk_py,v retrieving revision 1.2 diff -u -p -r1.2 patch-registry_genvk_py --- vulkan-headers/patches/patch-registry_genvk_py 7 Jul 2020 08:08:06 -0000 1.2 +++ vulkan-headers/patches/patch-registry_genvk_py 26 Jun 2021 21:33:58 -0000 @@ -7,5 +7,5 @@ Index: registry/genvk.py -#!/usr/bin/python3 +#!/usr/bin/env python3 # - # Copyright (c) 2013-2020 The Khronos Group Inc. + # Copyright 2013-2021 The Khronos Group Inc. # Index: vulkan-headers/patches/patch-registry_reg_py =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/patches/patch-registry_reg_py,v retrieving revision 1.3 diff -u -p -r1.3 patch-registry_reg_py --- vulkan-headers/patches/patch-registry_reg_py 27 Dec 2020 15:58:43 -0000 1.3 +++ vulkan-headers/patches/patch-registry_reg_py 26 Jun 2021 21:33:58 -0000 @@ -7,5 +7,5 @@ Index: registry/reg.py -#!/usr/bin/python3 -i +#!/usr/bin/env python3 -i # - # Copyright 2013-2020 The Khronos Group Inc. + # Copyright 2013-2021 The Khronos Group Inc. # Index: vulkan-headers/patches/patch-registry_vkconventions_py =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/patches/patch-registry_vkconventions_py,v retrieving revision 1.2 diff -u -p -r1.2 patch-registry_vkconventions_py --- vulkan-headers/patches/patch-registry_vkconventions_py 7 Jul 2020 08:08:06 -0000 1.2 +++ vulkan-headers/patches/patch-registry_vkconventions_py 26 Jun 2021 21:33:58 -0000 @@ -7,5 +7,5 @@ Index: registry/vkconventions.py -#!/usr/bin/python3 -i +#!/usr/bin/env python3 -i # - # Copyright (c) 2013-2020 The Khronos Group Inc. + # Copyright 2013-2021 The Khronos Group Inc. # Index: vulkan-headers/pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- vulkan-headers/pkg/PLIST 27 Dec 2020 15:58:43 -0000 1.3 +++ vulkan-headers/pkg/PLIST 26 Jun 2021 21:33:58 -0000 @@ -1,4 +1,11 @@ @comment $OpenBSD: PLIST,v 1.3 2020/12/27 15:58:43 thfr Exp $ +include/vk_video/ +include/vk_video/vulkan_video_codec_h264std.h +include/vk_video/vulkan_video_codec_h264std_decode.h +include/vk_video/vulkan_video_codec_h264std_encode.h +include/vk_video/vulkan_video_codec_h265std.h +include/vk_video/vulkan_video_codec_h265std_decode.h +include/vk_video/vulkan_video_codecs_common.h include/vulkan/ include/vulkan/vk_icd.h include/vulkan/vk_layer.h @@ -15,6 +22,7 @@ include/vulkan/vulkan_ggp.h include/vulkan/vulkan_ios.h include/vulkan/vulkan_macos.h include/vulkan/vulkan_metal.h +include/vulkan/vulkan_screen.h 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.11 diff -u -p -r1.11 Makefile --- vulkan-loader/Makefile 23 Feb 2021 19:39:26 -0000 1.11 +++ vulkan-loader/Makefile 26 Jun 2021 21:33:58 -0000 @@ -1,15 +1,10 @@ # $OpenBSD: Makefile,v 1.11 2021/02/23 19:39:26 sthen Exp $ -# Integrated clang assembler doesn't work with x86 - Bug #698164 -# remove if build can be updated to clang 9.0.0 (see -# https://github.com/KhronosGroup/Vulkan-Loader/issues/252) -BROKEN-i386 = clang integrated asm fails, https://github.com/KhronosGroup/Vulkan-Loader/issues/252 - COMMENT = Vulkan ICD loader -V = 1.2.162.0 +V = 1.2.176.1 PKGNAME = vulkan-loader-${V} -GH_TAGNAME = sdk-${V} +GH_TAGNAME = sdk.${V}-TAG GH_ACCOUNT = KhronosGroup GH_PROJECT = Vulkan-Loader Index: vulkan-loader/distinfo =================================================================== RCS file: /cvs/ports/graphics/vulkan-loader/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- vulkan-loader/distinfo 27 Dec 2020 15:58:43 -0000 1.3 +++ vulkan-loader/distinfo 26 Jun 2021 21:33:58 -0000 @@ -1,2 +1,2 @@ -SHA256 (Vulkan-Loader-sdk-1.2.162.0.tar.gz) = +PXsJIXn/bo/WMHN5aJRRezhxqaGyRukAWsowK8/Id0= -SIZE (Vulkan-Loader-sdk-1.2.162.0.tar.gz) = 1422604 +SHA256 (Vulkan-Loader-sdk.1.2.176.1-TAG.tar.gz) = me56ioAWDR4zPiEd55z2oOOO6EY5zyvC68eTHOgLG2o= +SIZE (Vulkan-Loader-sdk.1.2.176.1-TAG.tar.gz) = 1430372 Index: vulkan-loader/patches/patch-CMakeLists_txt =================================================================== RCS file: /cvs/ports/graphics/vulkan-loader/patches/patch-CMakeLists_txt,v retrieving revision 1.4 diff -u -p -r1.4 patch-CMakeLists_txt --- vulkan-loader/patches/patch-CMakeLists_txt 27 Dec 2020 15:58:43 -0000 1.4 +++ vulkan-loader/patches/patch-CMakeLists_txt 26 Jun 2021 21:33:58 -0000 @@ -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." -@@ -125,6 +125,7 @@ if(UNIX AND NOT APPLE) # i.e.: Linux +@@ -126,6 +126,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.5 diff -u -p -r1.5 patch-loader_CMakeLists_txt --- vulkan-loader/patches/patch-loader_CMakeLists_txt 27 Dec 2020 15:58:43 -0000 1.5 +++ vulkan-loader/patches/patch-loader_CMakeLists_txt 26 Jun 2021 21:33:58 -0000 @@ -15,7 +15,7 @@ Index: loader/CMakeLists.txt # Check for the existance of the secure_getenv or __secure_getenv commands include(CheckFunctionExists) -@@ -193,7 +193,6 @@ else(UNIX AND NOT APPLE) # i.e.: Linux +@@ -197,7 +197,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) -@@ -289,7 +288,7 @@ else() +@@ -297,7 +296,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 -@@ -314,9 +313,6 @@ else() +@@ -322,9 +321,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.3 diff -u -p -r1.3 patch-loader_loader_c --- vulkan-loader/patches/patch-loader_loader_c 27 Dec 2020 15:58:43 -0000 1.3 +++ vulkan-loader/patches/patch-loader_loader_c 26 Jun 2021 21:33:58 -0000 @@ -10,12 +10,12 @@ Index: loader/loader.c } // Environment variables --#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) -+#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__unix__) +-#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(); -@@ -7538,53 +7538,11 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_EnumerateDev +@@ -7559,53 +7559,11 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_EnumerateDev struct loader_extension_list all_exts = {0}; struct loader_extension_list icd_exts = {0}; 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.3 diff -u -p -r1.3 patch-loader_vk_loader_platform_h --- vulkan-loader/patches/patch-loader_vk_loader_platform_h 27 Dec 2020 15:58:43 -0000 1.3 +++ vulkan-loader/patches/patch-loader_vk_loader_platform_h 26 Jun 2021 21:33:58 -0000 @@ -9,8 +9,8 @@ Index: loader/vk_loader_platform.h #include "vulkan/vk_platform.h" #include "vulkan/vk_sdk_platform.h" --#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) -+#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) +-#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) ++#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) /* Linux-specific common code: */ // Headers: Index: vulkan-tools/Makefile =================================================================== RCS file: /cvs/ports/graphics/vulkan-tools/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- vulkan-tools/Makefile 23 Feb 2021 19:39:26 -0000 1.7 +++ vulkan-tools/Makefile 26 Jun 2021 21:33:58 -0000 @@ -2,9 +2,9 @@ COMMENT = Vulkan Utilities and Tools -V = 1.2.162.0 +V = 1.2.176.1 PKGNAME = vulkan-tools-${V} -GH_TAGNAME = sdk-${V} +GH_TAGNAME = sdk.${V}-TAG GH_ACCOUNT = KhronosGroup GH_PROJECT = Vulkan-Tools Index: vulkan-tools/distinfo =================================================================== RCS file: /cvs/ports/graphics/vulkan-tools/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- vulkan-tools/distinfo 27 Dec 2020 15:58:43 -0000 1.3 +++ vulkan-tools/distinfo 26 Jun 2021 21:33:58 -0000 @@ -1,2 +1,2 @@ -SHA256 (Vulkan-Tools-sdk-1.2.162.0.tar.gz) = gySm39G8INT61FxOpWNX2DVPwD4+RSnQpJGfEk2eYQY= -SIZE (Vulkan-Tools-sdk-1.2.162.0.tar.gz) = 724402 +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 Index: vulkan-tools/patches/patch-cube_cube_cpp =================================================================== RCS file: /cvs/ports/graphics/vulkan-tools/patches/patch-cube_cube_cpp,v retrieving revision 1.3 diff -u -p -r1.3 patch-cube_cube_cpp --- vulkan-tools/patches/patch-cube_cube_cpp 27 Dec 2020 15:58:43 -0000 1.3 +++ vulkan-tools/patches/patch-cube_cube_cpp 26 Jun 2021 21:33:58 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-cube_cube_cpp,v 1.3 2020 Index: cube/cube.cpp --- cube/cube.cpp.orig +++ cube/cube.cpp -@@ -3121,7 +3121,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPre +@@ -3194,7 +3194,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPre return (int)msg.wParam; } Index: vulkan-validation-layers/Makefile =================================================================== RCS file: /cvs/ports/graphics/vulkan-validation-layers/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- vulkan-validation-layers/Makefile 23 Feb 2021 19:39:27 -0000 1.7 +++ vulkan-validation-layers/Makefile 26 Jun 2021 21:33:58 -0000 @@ -2,9 +2,9 @@ COMMENT = Vulkan Validation Layers -V = 1.2.162.0 +V = 1.2.176.1 PKGNAME = vulkan-validation-layers-${V} -GH_TAGNAME = sdk-${V} +GH_TAGNAME = sdk.${V}-TAG GH_ACCOUNT = KhronosGroup GH_PROJECT = Vulkan-ValidationLayers @@ -32,7 +32,8 @@ BUILD_DEPENDS = graphics/glslang \ CONFIGURE_ARGS += -DGLSLANG_INSTALL_DIR="${LOCALBASE}" \ -DBUILD_WSI_WAYLAND_SUPPORT=False \ - -DSPIRV_HEADERS_INSTALL_DIR=${LOCALBASE}/include/spirv + -DSPIRV_HEADERS_INSTALL_DIR=${LOCALBASE}/include/spirv \ + -DUSE_ROBIN_HOOD_HASHING=False # Tests only build if Google Test framework is in directory external/ NO_TEST = Yes Index: vulkan-validation-layers/distinfo =================================================================== RCS file: /cvs/ports/graphics/vulkan-validation-layers/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- vulkan-validation-layers/distinfo 27 Dec 2020 15:58:43 -0000 1.3 +++ vulkan-validation-layers/distinfo 26 Jun 2021 21:33:58 -0000 @@ -1,2 +1,2 @@ -SHA256 (Vulkan-ValidationLayers-sdk-1.2.162.0.tar.gz) = gKqeGAs5AFmBIdej6mE2ZbmariG7QCaOyv2C34AWxvU= -SIZE (Vulkan-ValidationLayers-sdk-1.2.162.0.tar.gz) = 2427779 +SHA256 (Vulkan-ValidationLayers-sdk.1.2.176.1-TAG.tar.gz) = PuzAbOS3cxYOYCSsGEoOeT68cx3R6gtnXlbg8EXlDuQ= +SIZE (Vulkan-ValidationLayers-sdk.1.2.176.1-TAG.tar.gz) = 2709276 Index: vulkan-validation-layers/patches/patch-CMakeLists_txt =================================================================== RCS file: /cvs/ports/graphics/vulkan-validation-layers/patches/patch-CMakeLists_txt,v retrieving revision 1.2 diff -u -p -r1.2 patch-CMakeLists_txt --- vulkan-validation-layers/patches/patch-CMakeLists_txt 7 Jul 2020 08:08:08 -0000 1.2 +++ vulkan-validation-layers/patches/patch-CMakeLists_txt 26 Jun 2021 21:33:58 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.2 202 Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -95,6 +95,7 @@ if(UNIX AND NOT APPLE) # i.e. Linux +@@ -100,6 +100,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.2 diff -u -p -r1.2 patch-layers_CMakeLists_txt --- vulkan-validation-layers/patches/patch-layers_CMakeLists_txt 7 Jul 2020 08:08:08 -0000 1.2 +++ vulkan-validation-layers/patches/patch-layers_CMakeLists_txt 26 Jun 2021 21:33:58 -0000 @@ -5,12 +5,12 @@ include build dir before VulkanHeaders_I Index: layers/CMakeLists.txt --- layers/CMakeLists.txt.orig +++ layers/CMakeLists.txt -@@ -137,7 +137,7 @@ else(UNIX AND NOT APPLE) # i.e.: Linux - endmacro() - endif() +@@ -101,7 +101,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(WIN32) + if(MSVC) # Applies to all configurations 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.2 diff -u -p -r1.2 patch-layers_vk_mem_alloc_h --- vulkan-validation-layers/patches/patch-layers_vk_mem_alloc_h 7 Jul 2020 08:08:08 -0000 1.2 +++ vulkan-validation-layers/patches/patch-layers_vk_mem_alloc_h 26 Jun 2021 21:33:58 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-layers_vk_mem_alloc_h,v Index: layers/vk_mem_alloc.h --- layers/vk_mem_alloc.h.orig +++ layers/vk_mem_alloc.h -@@ -3180,7 +3180,7 @@ void *aligned_alloc(size_t alignment, size_t size) +@@ -3181,7 +3181,7 @@ void *aligned_alloc(size_t alignment, size_t size) return memalign(alignment, size); }