Diff below, tested with the usual - vkcube, vkcubepp, vulkaninfo work
as expected. I'm noticing with vkquake that there often different
errors on startup which don't seem related to vulkan (I noticed them
previously; probably a race condition and will check out for vkquake
port independently). Note no such issues with the other vulkan
applications.
Tested on Intel GPU (Tigerlake). I also started versioning the
SPIRV-Tools-shared library properly.
Release Notes:
https://github.com/KhronosGroup/glslang/releases/tag/13.0.0
https://vulkan.lunarg.com/doc/view/latest/windows/release_notes.html
ok?
? glslang/CHECK_SYM
? vulkan-loader/CHECK_SYM
Index: glslang//Makefile
===================================================================
RCS file: /cvs/ports/graphics/glslang/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- glslang//Makefile 2 Aug 2023 21:18:17 -0000 1.20
+++ glslang//Makefile 1 Sep 2023 16:15:18 -0000
@@ -2,15 +2,14 @@ PORTROACH = limit:^[0-9]
COMMENT = reference front-end for GLSL and ESSL
-GH_TAGNAME = 12.3.1
+GH_TAGNAME = 13.0.0
GH_ACCOUNT = KhronosGroup
GH_PROJECT = glslang
-REVISION = 0
-SHARED_LIBS += glslang 3.0 # 12.3
+SHARED_LIBS += glslang 4.0 # 13.0
SHARED_LIBS += HLSL 0.0 # 12.1
-SHARED_LIBS += SPIRV 2.0 # 12.3
-SHARED_LIBS += SPVRemapper 0.0 # 12.1
+SHARED_LIBS += SPIRV 3.0 # 13.0
+SHARED_LIBS += SPVRemapper 1.0 # 13.0
CATEGORIES = devel graphics
@@ -31,11 +30,6 @@ TEST_DEPENDS = graphics/spirv-tools \
shells/bash
CONFIGURE_ARGS += -DBUILD_SHARED_LIBS=ON
-
-# XXX: temporary supply the symlink to allow consumers that still look for
-# glslangValidator to transition
-post-install:
- ln -s glslang ${PREFIX}/bin/glslangValidator
do-test:
cd ${WRKSRC}/Test; exec ./runtests localResults \
Index: glslang//distinfo
===================================================================
RCS file: /cvs/ports/graphics/glslang/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- glslang//distinfo 2 Aug 2023 05:21:03 -0000 1.9
+++ glslang//distinfo 1 Sep 2023 16:15:18 -0000
@@ -1,2 +1,2 @@
-SHA256 (glslang-12.3.1.tar.gz) = pXg2pYOzBECHrFG7DV0tgD/4RZHVX4kIf8KazkKouag=
-SIZE (glslang-12.3.1.tar.gz) = 3718998
+SHA256 (glslang-13.0.0.tar.gz) = vNpzJDT4Kap0QU6g4G0ynsisKGN8OKDeReF8j9JaRxU=
+SIZE (glslang-13.0.0.tar.gz) = 3710806
Index: spirv-headers/Makefile
===================================================================
RCS file: /cvs/ports/graphics/spirv-headers/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- spirv-headers/Makefile 2 Aug 2023 05:21:03 -0000 1.13
+++ spirv-headers/Makefile 1 Sep 2023 16:15:18 -0000
@@ -1,6 +1,6 @@
COMMENT = SPIRV-Headers
-V = 1.3.250.1
+V = 1.3.261.1
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.11
diff -u -p -r1.11 distinfo
--- spirv-headers/distinfo 2 Aug 2023 05:21:03 -0000 1.11
+++ spirv-headers/distinfo 1 Sep 2023 16:15:18 -0000
@@ -1,2 +1,2 @@
-SHA256 (spirv-headers-1.3.250.1.tar.gz) =
1fjEt5Brr5xRrtu7LdlCAJ6GWOM0DG5kaZUYZmoD4EM=
-SIZE (spirv-headers-1.3.250.1.tar.gz) = 452425
+SHA256 (spirv-headers-1.3.261.1.tar.gz) =
MrTGrmovqbVsLBcjPIBW2kfjMfduEXcpklgl6j53pzk=
+SIZE (spirv-headers-1.3.261.1.tar.gz) = 456157
Index: spirv-tools/Makefile
===================================================================
RCS file: /cvs/ports/graphics/spirv-tools/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- spirv-tools/Makefile 2 Aug 2023 05:21:03 -0000 1.16
+++ spirv-tools/Makefile 1 Sep 2023 16:15:18 -0000
@@ -1,11 +1,13 @@
COMMENT = API and commands for processing SPIR-V
-V = 1.3.250.1
+V = 1.3.261.1
DISTNAME = spirv-tools-${V}
GH_ACCOUNT = KhronosGroup
GH_PROJECT = SPIRV-Tools
GH_TAGNAME = sdk-${V}
EPOCH = 0
+
+SHARED_LIBS += SPIRV-Tools-shared 0.0 # 1.3.261.1
CATEGORIES = devel graphics
Index: spirv-tools/distinfo
===================================================================
RCS file: /cvs/ports/graphics/spirv-tools/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- spirv-tools/distinfo 2 Aug 2023 05:21:03 -0000 1.12
+++ spirv-tools/distinfo 1 Sep 2023 16:15:18 -0000
@@ -1,2 +1,2 @@
-SHA256 (spirv-tools-1.3.250.1.tar.gz) =
bPoihpXkoDAP8w6v2IBWEoxnNCoPCDhADLOlZsqtx9Q=
-SIZE (spirv-tools-1.3.250.1.tar.gz) = 3113105
+SHA256 (spirv-tools-1.3.261.1.tar.gz) =
6tlcYmrUgogqFB0aoM5HuUU4cfcsQsCyjTnIL2ClIAg=
+SIZE (spirv-tools-1.3.261.1.tar.gz) = 3140301
Index: spirv-tools/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/spirv-tools/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- spirv-tools/pkg/PLIST 2 Aug 2023 05:21:03 -0000 1.7
+++ spirv-tools/pkg/PLIST 1 Sep 2023 16:15:18 -0000
@@ -48,7 +48,7 @@ lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget.
@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
+@lib lib/libSPIRV-Tools-shared.so.${LIBSPIRV-Tools-shared_VERSION}
@static-lib lib/libSPIRV-Tools.a
lib/pkgconfig/SPIRV-Tools-shared.pc
lib/pkgconfig/SPIRV-Tools.pc
Index: vulkan-headers/Makefile
===================================================================
RCS file: /cvs/ports/graphics/vulkan-headers/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- vulkan-headers/Makefile 2 Aug 2023 05:21:03 -0000 1.14
+++ vulkan-headers/Makefile 1 Sep 2023 16:15:18 -0000
@@ -1,6 +1,6 @@
COMMENT = Vulkan header files
-V = 1.3.250.1
+V = 1.3.261.1
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.11
diff -u -p -r1.11 distinfo
--- vulkan-headers/distinfo 2 Aug 2023 05:21:03 -0000 1.11
+++ vulkan-headers/distinfo 1 Sep 2023 16:15:18 -0000
@@ -1,2 +1,2 @@
-SHA256 (Vulkan-Headers-sdk-1.3.250.1.tar.gz) =
5bVjpBXnNyW89HG34+g3gE7TcDtHzORVPbXn5zghxe4=
-SIZE (Vulkan-Headers-sdk-1.3.250.1.tar.gz) = 1964540
+SHA256 (Vulkan-Headers-sdk-1.3.261.1.tar.gz) =
eiXr22Ml5ibcXTO8k3sonMzn3bewrBobHV1/8ztnFdM=
+SIZE (Vulkan-Headers-sdk-1.3.261.1.tar.gz) = 2046068
Index: vulkan-headers/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/vulkan-headers/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- vulkan-headers/pkg/PLIST 2 Aug 2023 05:21:04 -0000 1.12
+++ vulkan-headers/pkg/PLIST 1 Sep 2023 16:15:19 -0000
@@ -10,6 +10,7 @@ include/vulkan/
include/vulkan/vk_icd.h
include/vulkan/vk_layer.h
include/vulkan/vk_platform.h
+include/vulkan/vulkan.cppm
include/vulkan/vulkan.h
include/vulkan/vulkan.hpp
include/vulkan/vulkan_android.h
@@ -33,6 +34,7 @@ include/vulkan/vulkan_static_assertions.
include/vulkan/vulkan_structs.hpp
include/vulkan/vulkan_to_string.hpp
include/vulkan/vulkan_vi.h
+include/vulkan/vulkan_video.hpp
include/vulkan/vulkan_wayland.h
include/vulkan/vulkan_win32.h
include/vulkan/vulkan_xcb.h
@@ -42,7 +44,6 @@ 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
Index: vulkan-loader/Makefile
===================================================================
RCS file: /cvs/ports/graphics/vulkan-loader/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- vulkan-loader/Makefile 2 Aug 2023 05:21:04 -0000 1.21
+++ vulkan-loader/Makefile 1 Sep 2023 16:15:19 -0000
@@ -1,6 +1,6 @@
COMMENT = Vulkan ICD loader
-V = 1.3.250.1
+V = 1.3.261.1
PKGNAME = vulkan-loader-${V}
GH_TAGNAME = sdk-${V}
GH_ACCOUNT = KhronosGroup
@@ -21,7 +21,11 @@ WANTLIB += X11 xcb m pthread
BUILD_DEPENDS = graphics/vulkan-headers
RUN_DEPENDS = graphics/vulkan-headers
+# XXX: building 1.3.261.1 with ENABLE_WERROR fails with
+# vk_loader_platform.h:305:59: error: unused parameter 'buffer'
+# [-Werror,-Wunused-parameter]
CONFIGURE_ARGS =-DBUILD_WSI_WAYLAND_SUPPORT=False \
+ -DENABLE_WERROR=False \
-DFALLBACK_CONFIG_DIRS="${SYSCONFDIR}/xdg" \
-DFALLBACK_DATA_DIRS="${X11BASE}/share:${LOCALBASE}/share:/usr/share"
Index: vulkan-loader/distinfo
===================================================================
RCS file: /cvs/ports/graphics/vulkan-loader/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- vulkan-loader/distinfo 2 Aug 2023 05:21:04 -0000 1.11
+++ vulkan-loader/distinfo 1 Sep 2023 16:15:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (Vulkan-Loader-sdk-1.3.250.1.tar.gz) =
uYLsX66a9jZIFqfF/PTT5cKb/co19LEu4fkOSS5BrcI=
-SIZE (Vulkan-Loader-sdk-1.3.250.1.tar.gz) = 1661074
+SHA256 (Vulkan-Loader-sdk-1.3.261.1.tar.gz) =
+F8OpXtjdQ1N2vbIZJ33gcR3cAbao813KwHnte0C8/I=
+SIZE (Vulkan-Loader-sdk-1.3.261.1.tar.gz) = 1684764
Index: vulkan-tools/Makefile
===================================================================
RCS file: /cvs/ports/graphics/vulkan-tools/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- vulkan-tools/Makefile 2 Aug 2023 05:21:04 -0000 1.16
+++ vulkan-tools/Makefile 1 Sep 2023 16:15:19 -0000
@@ -1,6 +1,6 @@
COMMENT = Vulkan Utilities and Tools
-V = 1.3.250.1
+V = 1.3.261.1
PKGNAME = vulkan-tools-${V}
GH_TAGNAME = sdk-${V}
GH_ACCOUNT = KhronosGroup
Index: vulkan-tools/distinfo
===================================================================
RCS file: /cvs/ports/graphics/vulkan-tools/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- vulkan-tools/distinfo 2 Aug 2023 05:21:04 -0000 1.11
+++ vulkan-tools/distinfo 1 Sep 2023 16:15:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (Vulkan-Tools-sdk-1.3.250.1.tar.gz) =
g5HSHN8+KpFM6Rp7JN0TTVepQE2GiTIBYZv2GeVrPyA=
-SIZE (Vulkan-Tools-sdk-1.3.250.1.tar.gz) = 785996
+SHA256 (Vulkan-Tools-sdk-1.3.261.1.tar.gz) =
B1Q9dhta5T44D996P0K9cG8s8a0EoxA4H884b++4FMY=
+SIZE (Vulkan-Tools-sdk-1.3.261.1.tar.gz) = 801322
Index: vulkan-validation-layers/Makefile
===================================================================
RCS file: /cvs/ports/graphics/vulkan-validation-layers/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- vulkan-validation-layers/Makefile 2 Aug 2023 05:21:04 -0000 1.19
+++ vulkan-validation-layers/Makefile 1 Sep 2023 16:15:19 -0000
@@ -1,6 +1,6 @@
COMMENT = Vulkan Validation Layers
-V = 1.3.250.1
+V = 1.3.261.1
PKGNAME = vulkan-validation-layers-${V}
GH_TAGNAME = sdk-${V}
GH_ACCOUNT = KhronosGroup
Index: vulkan-validation-layers/distinfo
===================================================================
RCS file: /cvs/ports/graphics/vulkan-validation-layers/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- vulkan-validation-layers/distinfo 2 Aug 2023 05:21:04 -0000 1.11
+++ vulkan-validation-layers/distinfo 1 Sep 2023 16:15:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (Vulkan-ValidationLayers-sdk-1.3.250.1.tar.gz) =
tbh6MpM0fKL47oXO4LNCrng0czfG0AsbvM3iKDnifA0=
-SIZE (Vulkan-ValidationLayers-sdk-1.3.250.1.tar.gz) = 4831469
+SHA256 (Vulkan-ValidationLayers-sdk-1.3.261.1.tar.gz) =
E3LVIvKXuz+zhoArGqS3+IWp4elppqPG6bKdOBNX8h0=
+SIZE (Vulkan-ValidationLayers-sdk-1.3.261.1.tar.gz) = 5005018
Index:
vulkan-validation-layers/patches/patch-layers_vulkan_generated_vk_extension_helper_h
===================================================================
RCS file:
/cvs/ports/graphics/vulkan-validation-layers/patches/patch-layers_vulkan_generated_vk_extension_helper_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-layers_vulkan_generated_vk_extension_helper_h
---
vulkan-validation-layers/patches/patch-layers_vulkan_generated_vk_extension_helper_h
2 Aug 2023 05:21:04 -0000 1.1
+++
vulkan-validation-layers/patches/patch-layers_vulkan_generated_vk_extension_helper_h
1 Sep 2023 16:15:19 -0000
@@ -3,7 +3,7 @@ avoid collision with major/minor in type
Index: layers/vulkan/generated/vk_extension_helper.h
--- layers/vulkan/generated/vk_extension_helper.h.orig
+++ layers/vulkan/generated/vk_extension_helper.h
-@@ -55,6 +55,12 @@ enum ExtEnabled : unsigned char {
+@@ -74,6 +74,12 @@ Times to NOT use it
#define VVL_UNRECOGNIZED_API_VERSION 0xFFFFFFFF
