Hi,
Here is an update to the latest Vulkan SDK 1.3.224.1, along with
glslang to 11.11.0. Tested here on my Intel Tigerlake setup without
regressions in vulkaninfo, vkcube, and vkquake. Also tested with
VK_INSTANCE_LAYERS=VK_LAYER_KHRONOS_validation; everything looking as
expected.
Sharing this to give an opportunity to test this on other GPUs and
architectures, as an increasing number of applications relies on
Vulkan.
oks? Concerns?
Index: glslang//Makefile
===================================================================
RCS file: /cvs/ports/graphics/glslang/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- glslang//Makefile 11 Mar 2022 19:22:27 -0000 1.12
+++ glslang//Makefile 27 Aug 2022 01:54:26 -0000
@@ -2,7 +2,7 @@ PORTROACH = limit:^[0-9]
COMMENT = reference front-end for GLSL and ESSL
-GH_TAGNAME = 11.7.0
+GH_TAGNAME = 11.11.0
GH_ACCOUNT = KhronosGroup
GH_PROJECT = glslang
Index: glslang//distinfo
===================================================================
RCS file: /cvs/ports/graphics/glslang/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- glslang//distinfo 9 Dec 2021 04:48:31 -0000 1.5
+++ glslang//distinfo 27 Aug 2022 01:54:26 -0000
@@ -1,2 +1,2 @@
-SHA256 (glslang-11.7.0.tar.gz) = tsg4ZMNgZnjRFnURT6XzWMUZ/h2tmngYArzIf7j6MtU=
-SIZE (glslang-11.7.0.tar.gz) = 3426327
+SHA256 (glslang-11.11.0.tar.gz) = JsIWwwYlEsAYy911IiS42tcDt+W7kL8zi6LbtdTxFDg=
+SIZE (glslang-11.11.0.tar.gz) = 3542123
Index: glslang//pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/glslang/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- glslang//pkg/PLIST 11 Mar 2022 19:22:27 -0000 1.4
+++ glslang//pkg/PLIST 27 Aug 2022 01:54:26 -0000
@@ -67,23 +67,14 @@ 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
-lib/cmake/OGLCompilerTargets${MODCMAKE_BUILD_SUFFIX}
lib/cmake/OGLCompilerTargets.cmake
-lib/cmake/OSDependentTargets${MODCMAKE_BUILD_SUFFIX}
lib/cmake/OSDependentTargets.cmake
-lib/cmake/SPIRVTargets${MODCMAKE_BUILD_SUFFIX}
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
@@ -94,3 +85,8 @@ 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.9
diff -u -p -r1.9 Makefile
--- spirv-headers/Makefile 21 Mar 2022 13:21:42 -0000 1.9
+++ spirv-headers/Makefile 27 Aug 2022 01:54:26 -0000
@@ -1,6 +1,6 @@
COMMENT = SPIRV-Headers
-V = 1.3.204.1
+V = 1.3.224.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.7
diff -u -p -r1.7 distinfo
--- spirv-headers/distinfo 21 Mar 2022 13:21:42 -0000 1.7
+++ spirv-headers/distinfo 27 Aug 2022 01:54:26 -0000
@@ -1,2 +1,2 @@
-SHA256 (spirv-headers-1.3.204.1.tar.gz) = JihkBTlowhfUWyS4kESnc2oyNhiUdD3Wz+eI3yWMdGw=
-SIZE (spirv-headers-1.3.204.1.tar.gz) = 417550
+SHA256 (spirv-headers-1.3.224.1.tar.gz) = yFcUv+YvhAByhr07PARxrwp+BqtmvCykYjBDARsoc38=
+SIZE (spirv-headers-1.3.224.1.tar.gz) = 437010
Index: spirv-headers/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/spirv-headers/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- spirv-headers/pkg/PLIST 11 Mar 2022 19:23:27 -0000 1.6
+++ spirv-headers/pkg/PLIST 27 Aug 2022 01:54:26 -0000
@@ -62,6 +62,7 @@ include/spirv/unified1/extinst.spv-amd-g
include/spirv/unified1/extinst.spv-amd-shader-ballot.grammar.json
include/spirv/unified1/extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json
include/spirv/unified1/extinst.spv-amd-shader-trinary-minmax.grammar.json
+include/spirv/unified1/spirv.bf
include/spirv/unified1/spirv.core.grammar.json
include/spirv/unified1/spirv.cs
include/spirv/unified1/spirv.h
Index: spirv-tools/Makefile
===================================================================
RCS file: /cvs/ports/graphics/spirv-tools/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- spirv-tools/Makefile 21 Mar 2022 13:21:42 -0000 1.12
+++ spirv-tools/Makefile 27 Aug 2022 01:54:26 -0000
@@ -1,6 +1,6 @@
COMMENT = API and commands for processing SPIR-V
-V = 1.3.204.1
+V = 1.3.224.1
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.8
diff -u -p -r1.8 distinfo
--- spirv-tools/distinfo 21 Mar 2022 13:21:42 -0000 1.8
+++ spirv-tools/distinfo 27 Aug 2022 01:54:26 -0000
@@ -1,2 +1,2 @@
-SHA256 (spirv-tools-1.3.204.1.tar.gz) = bhmQDpSJRCQwJK7dCiAbrzhUs3e5zHo4ZVO8EDsIczU=
-SIZE (spirv-tools-1.3.204.1.tar.gz) = 2905629
+SHA256 (spirv-tools-1.3.224.1.tar.gz) = yteOVCvy+lnjMBnngN+Obftan0Qgo/ziO0wWKiET4W4=
+SIZE (spirv-tools-1.3.224.1.tar.gz) = 3033574
Index: spirv-tools/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/spirv-tools/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- spirv-tools/pkg/PLIST 11 Mar 2022 19:23:27 -0000 1.4
+++ spirv-tools/pkg/PLIST 27 Aug 2022 01:54:26 -0000
@@ -15,6 +15,10 @@ include/spirv-tools/linker.hpp
include/spirv-tools/optimizer.hpp
lib/cmake/
lib/cmake/SPIRV-Tools/
+lib/cmake/SPIRV-Tools-diff/
+lib/cmake/SPIRV-Tools-diff/SPIRV-Tools-diffConfig.cmake
+lib/cmake/SPIRV-Tools-diff/SPIRV-Tools-diffTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/SPIRV-Tools-diff/SPIRV-Tools-diffTargets.cmake
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}
@@ -34,6 +38,7 @@ lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools
lib/cmake/SPIRV-Tools/SPIRV-ToolsConfig.cmake
lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget${MODCMAKE_BUILD_SUFFIX}
lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake
+@static-lib lib/libSPIRV-Tools-diff.a
@static-lib lib/libSPIRV-Tools-link.a
@static-lib lib/libSPIRV-Tools-lint.a
@static-lib lib/libSPIRV-Tools-opt.a
Index: vulkan-headers/Makefile
===================================================================
RCS file: /cvs/ports/graphics/vulkan-headers/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- vulkan-headers/Makefile 21 Mar 2022 13:21:42 -0000 1.10
+++ vulkan-headers/Makefile 27 Aug 2022 01:54:26 -0000
@@ -1,6 +1,6 @@
COMMENT = Vulkan header files
-V = 1.3.204.1
+V = 1.3.224.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.7
diff -u -p -r1.7 distinfo
--- vulkan-headers/distinfo 21 Mar 2022 13:21:42 -0000 1.7
+++ vulkan-headers/distinfo 27 Aug 2022 01:54:26 -0000
@@ -1,2 +1,2 @@
-SHA256 (Vulkan-Headers-sdk-1.3.204.1.tar.gz) = nE0z9xRnyRV0n79IwMOo7ngz8Vur85jjRjzYh5H7WS4=
-SIZE (Vulkan-Headers-sdk-1.3.204.1.tar.gz) = 1422950
+SHA256 (Vulkan-Headers-sdk-1.3.224.1.tar.gz) = YovVlDwNAHwZJ2lIDniYAaCI+JJEXIDLM2/JttI2xe8=
+SIZE (Vulkan-Headers-sdk-1.3.224.1.tar.gz) = 1521349
Index: vulkan-headers/patches/patch-registry_apiconventions_py
===================================================================
RCS file: vulkan-headers/patches/patch-registry_apiconventions_py
diff -N vulkan-headers/patches/patch-registry_apiconventions_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ vulkan-headers/patches/patch-registry_apiconventions_py 27 Aug 2022 01:54:26 -0000
@@ -0,0 +1,9 @@
+Index: registry/apiconventions.py
+--- registry/apiconventions.py.orig
++++ registry/apiconventions.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python3 -i
++#!/usr/bin/env python3 -i
+ #
+ # Copyright 2021-2022 The Khronos Group Inc.
+ # SPDX-License-Identifier: Apache-2.0
Index: vulkan-headers/patches/patch-registry_conventions_py
===================================================================
RCS file: vulkan-headers/patches/patch-registry_conventions_py
diff -N vulkan-headers/patches/patch-registry_conventions_py
--- vulkan-headers/patches/patch-registry_conventions_py 21 Mar 2022 13:21:42 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-Index: registry/conventions.py
---- registry/conventions.py.orig
-+++ registry/conventions.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3 -i
-+#!/usr/bin/env python3 -i
- #
- # Copyright 2013-2022 The Khronos Group Inc.
- #
Index: vulkan-headers/patches/patch-registry_spec_tools_conventions_py
===================================================================
RCS file: vulkan-headers/patches/patch-registry_spec_tools_conventions_py
diff -N vulkan-headers/patches/patch-registry_spec_tools_conventions_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ vulkan-headers/patches/patch-registry_spec_tools_conventions_py 27 Aug 2022 01:54:27 -0000
@@ -0,0 +1,9 @@
+Index: registry/spec_tools/conventions.py
+--- registry/spec_tools/conventions.py.orig
++++ registry/spec_tools/conventions.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python3 -i
++#!/usr/bin/env python3 -i
+ #
+ # Copyright 2013-2022 The Khronos Group Inc.
+ #
Index: vulkan-headers/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/vulkan-headers/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- vulkan-headers/pkg/PLIST 21 Mar 2022 13:21:42 -0000 1.8
+++ vulkan-headers/pkg/PLIST 27 Aug 2022 01:54:27 -0000
@@ -18,6 +18,7 @@ include/vulkan/vulkan_beta.h
include/vulkan/vulkan_core.h
include/vulkan/vulkan_directfb.h
include/vulkan/vulkan_enums.hpp
+include/vulkan/vulkan_format_traits.hpp
include/vulkan/vulkan_fuchsia.h
include/vulkan/vulkan_funcs.hpp
include/vulkan/vulkan_ggp.h
@@ -29,6 +30,7 @@ include/vulkan/vulkan_metal.h
include/vulkan/vulkan_raii.hpp
include/vulkan/vulkan_screen.h
include/vulkan/vulkan_structs.hpp
+include/vulkan/vulkan_to_string.hpp
include/vulkan/vulkan_vi.h
include/vulkan/vulkan_wayland.h
include/vulkan/vulkan_win32.h
@@ -39,12 +41,13 @@ share/vulkan/
share/vulkan/registry/
share/vulkan/registry/apiconventions.py
share/vulkan/registry/cgenerator.py
-share/vulkan/registry/conventions.py
share/vulkan/registry/generator.py
share/vulkan/registry/genvk.py
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/validusage.json
+share/vulkan/registry/video.xml
share/vulkan/registry/vk.xml
share/vulkan/registry/vkconventions.py
Index: vulkan-loader/Makefile
===================================================================
RCS file: /cvs/ports/graphics/vulkan-loader/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- vulkan-loader/Makefile 21 Mar 2022 13:21:42 -0000 1.16
+++ vulkan-loader/Makefile 27 Aug 2022 01:54:27 -0000
@@ -1,6 +1,6 @@
COMMENT = Vulkan ICD loader
-V = 1.3.204.1
+V = 1.3.224.1
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.7
diff -u -p -r1.7 distinfo
--- vulkan-loader/distinfo 21 Mar 2022 13:21:42 -0000 1.7
+++ vulkan-loader/distinfo 27 Aug 2022 01:54:27 -0000
@@ -1,2 +1,2 @@
-SHA256 (Vulkan-Loader-sdk-1.3.204.1.tar.gz) = Xc1CtWSAT0wBiR3dQppKUCgRPEzzm0QlZono9UN3MTQ=
-SIZE (Vulkan-Loader-sdk-1.3.204.1.tar.gz) = 1465881
+SHA256 (Vulkan-Loader-sdk-1.3.224.1.tar.gz) = TVSxSJ+qQtMJ5dHjTWZVqVh62Yjpm7Kizg41eETyyy0=
+SIZE (Vulkan-Loader-sdk-1.3.224.1.tar.gz) = 1594973
Index: vulkan-loader/patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/graphics/vulkan-loader/patches/patch-CMakeLists_txt,v
retrieving revision 1.8
diff -u -p -r1.8 patch-CMakeLists_txt
--- vulkan-loader/patches/patch-CMakeLists_txt 11 Mar 2022 19:23:30 -0000 1.8
+++ vulkan-loader/patches/patch-CMakeLists_txt 27 Aug 2022 01:54:27 -0000
@@ -1,23 +1,19 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -188,13 +188,13 @@ set(LOADER_HELPER_FOLDER "Helper Targets")
+@@ -180,9 +180,9 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+ set(LOADER_HELPER_FOLDER "Helper Targets")
if(UNIX)
- set(
-- FALLBACK_CONFIG_DIRS "/etc/xdg"
-+ FALLBACK_CONFIG_DIRS "${SYSCONFDIR}/xdg"
- CACHE
- STRING
- "Search path to use when XDG_CONFIG_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant."
- )
- set(
-- FALLBACK_DATA_DIRS "/usr/local/share:/usr/share"
-+ FALLBACK_DATA_DIRS "${X11BASE}/share:${LOCALBASE}/share:/usr/share"
- 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."
-@@ -216,6 +216,7 @@ if(UNIX AND NOT APPLE) # i.e.: Linux
+- set(FALLBACK_CONFIG_DIRS "/etc/xdg" CACHE STRING
++ set(FALLBACK_CONFIG_DIRS "${SYSCONFDIR}/xdg" CACHE STRING
+ "Search path to use when XDG_CONFIG_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant.")
+- set(FALLBACK_DATA_DIRS "/usr/local/share:/usr/share" CACHE STRING
++ set(FALLBACK_DATA_DIRS "${X11BASE}/share:${LOCALBASE}/share:/usr/share" 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.")
+ 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)
Index: vulkan-loader/patches/patch-loader_CMakeLists_txt
===================================================================
RCS file: vulkan-loader/patches/patch-loader_CMakeLists_txt
diff -N vulkan-loader/patches/patch-loader_CMakeLists_txt
--- vulkan-loader/patches/patch-loader_CMakeLists_txt 11 Mar 2022 19:23:30 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-Index: loader/CMakeLists.txt
---- loader/CMakeLists.txt.orig
-+++ loader/CMakeLists.txt
-@@ -17,7 +17,7 @@
- # limitations under the License.
- # ~~~
-
--include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/generated ${CMAKE_CURRENT_BINARY_DIR})
-+include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/generated ${CMAKE_CURRENT_BINARY_DIR})
-
- # Get version of the API the generated code used and put it into a cmake variable LOADER_GENERATED_HEADER_VERSION
- include(generated/loader_generated_header_version.cmake)
-@@ -360,7 +360,7 @@ else()
- add_library(vulkan-framework SHARED ${NORMAL_LOADER_SRCS} ${OPT_LOADER_SRCS} ${FRAMEWORK_HEADERS})
- endif()
- add_dependencies(vulkan-framework loader_asm_gen_files)
-- target_link_libraries(vulkan-framework -ldl -lpthread -lm "-framework CoreFoundation")
-+ target_link_libraries(vulkan-framework -lpthread -lm "-framework CoreFoundation")
- 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
-@@ -385,9 +385,6 @@ else()
- # cmake-format: on
- endif()
-
-- if(NOT APPLE)
-- target_compile_definitions(vulkan PRIVATE _XOPEN_SOURCE=500) # hush compiler warnings for readlink
-- endif()
- endif()
-
- # Generate pkg-config file.
Index: vulkan-loader/patches/patch-loader_allocation_h
===================================================================
RCS file: vulkan-loader/patches/patch-loader_allocation_h
diff -N vulkan-loader/patches/patch-loader_allocation_h
--- vulkan-loader/patches/patch-loader_allocation_h 11 Mar 2022 19:23:30 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-Index: loader/allocation.h
---- loader/allocation.h.orig
-+++ loader/allocation.h
-@@ -39,8 +39,8 @@ void loader_device_heap_free(const struct loader_devic
- void *loader_device_heap_realloc(const struct loader_device *device, void *pMemory, size_t orig_size, size_t size,
- VkSystemAllocationScope alloc_scope);
-
--#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)
--
No comments:
Post a Comment