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
No comments:
Post a Comment