Hi,
This updates the vulkan-* and spirv-* ports to 1.3.204.1 from February
16. I've tested them on both Intel Tigerlake and amdgpu Vega 10 without
regressions, using vkcube, vulkaninfo, and vkquake.
The Tigerlake seems less stable. Sometimes when I start vkquake on it,
the graphics have artifacts like flickering, and when that happened,
the whole system became unresponsive once. I've tested this with our
current vulkan 1.2.198.0 and the same thing happens there, too, so not
a regression. Usually, exiting the program and starting it again fixes
it.
In other new, it seems that the dependency on glslang is gone. I've been
able to run my test cases (vkcube, vkcubepp, vulkaninfo, and vkquake)
including `VK_INSTANCE_LAYERS=VK_LAYER_KHRONOS_validation` env without
issues, and it's not needed for the build.
After spirv-headers, spirv-tools has now also adopted the vulkan
versioning. This makes it easier to keep things in sync, but means that
now spirv-headers also needs an EPOCH=0, unfortunately.
The 2 patches that fixed vulkaninfo in vulkan-tools aren't needed
anymore for vulkaninfo to work.
More testing would be appreciated, especially on other Tigerlake GPUs
and non-amd64 arches.
OK?
Index: graphics/spirv-headers/Makefile
===================================================================
RCS file: /cvs/ports/graphics/spirv-headers/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- graphics/spirv-headers/Makefile 11 Mar 2022 19:23:27 -0000 1.8
+++ graphics/spirv-headers/Makefile 17 Mar 2022 12:11:00 -0000
@@ -1,6 +1,6 @@
COMMENT = SPIRV-Headers
-V = 1.2.198.0
+V = 1.3.204.1
DISTNAME = spirv-headers-${V}
GH_ACCOUNT = KhronosGroup
GH_PROJECT = SPIRV-Headers
Index: graphics/spirv-headers/distinfo
===================================================================
RCS file: /cvs/ports/graphics/spirv-headers/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- graphics/spirv-headers/distinfo 9 Dec 2021 04:48:31 -0000 1.6
+++ graphics/spirv-headers/distinfo 17 Mar 2022 12:11:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (spirv-headers-1.2.198.0.tar.gz) =
MwGiOsoENDNqZD5DPcrKzdYAAKs9013AB4opfAYSShI=
-SIZE (spirv-headers-1.2.198.0.tar.gz) = 416113
+SHA256 (spirv-headers-1.3.204.1.tar.gz) =
JihkBTlowhfUWyS4kESnc2oyNhiUdD3Wz+eI3yWMdGw=
+SIZE (spirv-headers-1.3.204.1.tar.gz) = 417550
Index: graphics/spirv-tools/Makefile
===================================================================
RCS file: /cvs/ports/graphics/spirv-tools/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- graphics/spirv-tools/Makefile 11 Mar 2022 19:23:27 -0000 1.11
+++ graphics/spirv-tools/Makefile 17 Mar 2022 12:11:00 -0000
@@ -1,10 +1,11 @@
COMMENT = API and commands for processing SPIR-V
-V = 2021.4
+V = 1.3.204.1
DISTNAME = spirv-tools-${V}
GH_ACCOUNT = KhronosGroup
GH_PROJECT = SPIRV-Tools
-GH_TAGNAME = v${V}
+GH_TAGNAME = sdk-${V}
+EPOCH = 0
CATEGORIES = devel graphics
Index: graphics/spirv-tools/distinfo
===================================================================
RCS file: /cvs/ports/graphics/spirv-tools/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- graphics/spirv-tools/distinfo 9 Dec 2021 04:48:31 -0000 1.7
+++ graphics/spirv-tools/distinfo 17 Mar 2022 12:11:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (spirv-tools-2021.4.tar.gz) =
1o3iYHCN2nhdEJ/xzu7N4tKrcRQvpb9ZBhu59H3Tuyw=
-SIZE (spirv-tools-2021.4.tar.gz) = 2887505
+SHA256 (spirv-tools-1.3.204.1.tar.gz) =
bhmQDpSJRCQwJK7dCiAbrzhUs3e5zHo4ZVO8EDsIczU=
+SIZE (spirv-tools-1.3.204.1.tar.gz) = 2905629
Index: graphics/vulkan-headers/Makefile
===================================================================
RCS file: /cvs/ports/graphics/vulkan-headers/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- graphics/vulkan-headers/Makefile 11 Mar 2022 19:23:30 -0000 1.9
+++ graphics/vulkan-headers/Makefile 17 Mar 2022 12:11:00 -0000
@@ -1,6 +1,6 @@
COMMENT = Vulkan header files
-V = 1.2.198.0
+V = 1.3.204.1
PKGNAME = vulkan-headers-${V}
GH_TAGNAME = sdk-${V}
GH_ACCOUNT = KhronosGroup
Index: graphics/vulkan-headers/distinfo
===================================================================
RCS file: /cvs/ports/graphics/vulkan-headers/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- graphics/vulkan-headers/distinfo 9 Dec 2021 04:48:31 -0000 1.6
+++ graphics/vulkan-headers/distinfo 17 Mar 2022 12:11:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (Vulkan-Headers-sdk-1.2.198.0.tar.gz) =
NHgsYcrZs8zy+gox7Dl9T86ZSQUAtPN3HLGkhxP+zoA=
-SIZE (Vulkan-Headers-sdk-1.2.198.0.tar.gz) = 1288107
+SHA256 (Vulkan-Headers-sdk-1.3.204.1.tar.gz) =
nE0z9xRnyRV0n79IwMOo7ngz8Vur85jjRjzYh5H7WS4=
+SIZE (Vulkan-Headers-sdk-1.3.204.1.tar.gz) = 1422950
Index: graphics/vulkan-headers/patches/patch-registry_cgenerator_py
===================================================================
RCS file:
/cvs/ports/graphics/vulkan-headers/patches/patch-registry_cgenerator_py,v
retrieving revision 1.4
diff -u -p -r1.4 patch-registry_cgenerator_py
--- graphics/vulkan-headers/patches/patch-registry_cgenerator_py 11 Mar
2022 19:23:30 -0000 1.4
+++ graphics/vulkan-headers/patches/patch-registry_cgenerator_py 17 Mar
2022 12:11:00 -0000
@@ -5,5 +5,5 @@ Index: registry/cgenerator.py
-#!/usr/bin/python3 -i
+#!/usr/bin/env python3 -i
#
- # Copyright 2013-2021 The Khronos Group Inc.
+ # Copyright 2013-2022 The Khronos Group Inc.
#
Index: graphics/vulkan-headers/patches/patch-registry_conventions_py
===================================================================
RCS file:
/cvs/ports/graphics/vulkan-headers/patches/patch-registry_conventions_py,v
retrieving revision 1.4
diff -u -p -r1.4 patch-registry_conventions_py
--- graphics/vulkan-headers/patches/patch-registry_conventions_py 11 Mar
2022 19:23:30 -0000 1.4
+++ graphics/vulkan-headers/patches/patch-registry_conventions_py 17 Mar
2022 12:11:00 -0000
@@ -5,5 +5,5 @@ Index: registry/conventions.py
-#!/usr/bin/python3 -i
+#!/usr/bin/env python3 -i
#
- # Copyright 2013-2021 The Khronos Group Inc.
+ # Copyright 2013-2022 The Khronos Group Inc.
#
Index: graphics/vulkan-headers/patches/patch-registry_generator_py
===================================================================
RCS file:
/cvs/ports/graphics/vulkan-headers/patches/patch-registry_generator_py,v
retrieving revision 1.4
diff -u -p -r1.4 patch-registry_generator_py
--- graphics/vulkan-headers/patches/patch-registry_generator_py 11 Mar 2022
19:23:30 -0000 1.4
+++ graphics/vulkan-headers/patches/patch-registry_generator_py 17 Mar 2022
12:11:00 -0000
@@ -5,5 +5,5 @@ Index: registry/generator.py
-#!/usr/bin/python3 -i
+#!/usr/bin/env python3 -i
#
- # Copyright 2013-2021 The Khronos Group Inc.
+ # Copyright 2013-2022 The Khronos Group Inc.
#
Index: graphics/vulkan-headers/patches/patch-registry_genvk_py
===================================================================
RCS file: /cvs/ports/graphics/vulkan-headers/patches/patch-registry_genvk_py,v
retrieving revision 1.4
diff -u -p -r1.4 patch-registry_genvk_py
--- graphics/vulkan-headers/patches/patch-registry_genvk_py 11 Mar 2022
19:23:30 -0000 1.4
+++ graphics/vulkan-headers/patches/patch-registry_genvk_py 17 Mar 2022
12:11:00 -0000
@@ -5,5 +5,5 @@ Index: registry/genvk.py
-#!/usr/bin/python3
+#!/usr/bin/env python3
#
- # Copyright 2013-2021 The Khronos Group Inc.
+ # Copyright 2013-2022 The Khronos Group Inc.
#
Index: graphics/vulkan-headers/patches/patch-registry_reg_py
===================================================================
RCS file: /cvs/ports/graphics/vulkan-headers/patches/patch-registry_reg_py,v
retrieving revision 1.5
diff -u -p -r1.5 patch-registry_reg_py
--- graphics/vulkan-headers/patches/patch-registry_reg_py 11 Mar 2022
19:23:30 -0000 1.5
+++ graphics/vulkan-headers/patches/patch-registry_reg_py 17 Mar 2022
12:11:00 -0000
@@ -5,5 +5,5 @@ Index: registry/reg.py
-#!/usr/bin/python3 -i
+#!/usr/bin/env python3 -i
#
- # Copyright 2013-2021 The Khronos Group Inc.
+ # Copyright 2013-2022 The Khronos Group Inc.
#
Index: graphics/vulkan-headers/patches/patch-registry_vkconventions_py
===================================================================
RCS file:
/cvs/ports/graphics/vulkan-headers/patches/patch-registry_vkconventions_py,v
retrieving revision 1.4
diff -u -p -r1.4 patch-registry_vkconventions_py
--- graphics/vulkan-headers/patches/patch-registry_vkconventions_py 11 Mar
2022 19:23:30 -0000 1.4
+++ graphics/vulkan-headers/patches/patch-registry_vkconventions_py 17 Mar
2022 12:11:00 -0000
@@ -5,5 +5,5 @@ Index: registry/vkconventions.py
-#!/usr/bin/python3 -i
+#!/usr/bin/env python3 -i
#
- # Copyright 2013-2021 The Khronos Group Inc.
+ # Copyright 2013-2022 The Khronos Group Inc.
#
Index: graphics/vulkan-headers/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/vulkan-headers/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- graphics/vulkan-headers/pkg/PLIST 11 Mar 2022 19:23:30 -0000 1.7
+++ graphics/vulkan-headers/pkg/PLIST 17 Mar 2022 12:11:00 -0000
@@ -22,6 +22,7 @@ include/vulkan/vulkan_fuchsia.h
include/vulkan/vulkan_funcs.hpp
include/vulkan/vulkan_ggp.h
include/vulkan/vulkan_handles.hpp
+include/vulkan/vulkan_hash.hpp
include/vulkan/vulkan_ios.h
include/vulkan/vulkan_macos.h
include/vulkan/vulkan_metal.h
@@ -36,6 +37,7 @@ include/vulkan/vulkan_xlib.h
include/vulkan/vulkan_xlib_xrandr.h
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
Index: graphics/vulkan-loader/Makefile
===================================================================
RCS file: /cvs/ports/graphics/vulkan-loader/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- graphics/vulkan-loader/Makefile 11 Mar 2022 19:23:30 -0000 1.15
+++ graphics/vulkan-loader/Makefile 17 Mar 2022 12:11:00 -0000
@@ -1,12 +1,12 @@
COMMENT = Vulkan ICD loader
-V = 1.2.198.0
+V = 1.3.204.1
PKGNAME = vulkan-loader-${V}
GH_TAGNAME = sdk-${V}
GH_ACCOUNT = KhronosGroup
GH_PROJECT = Vulkan-Loader
-SHARED_LIBS += vulkan 1.0 # 1.2.198
+SHARED_LIBS += vulkan 1.1 # 1.3.204.1
CATEGORIES = devel graphics
Index: graphics/vulkan-loader/distinfo
===================================================================
RCS file: /cvs/ports/graphics/vulkan-loader/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- graphics/vulkan-loader/distinfo 9 Dec 2021 04:48:32 -0000 1.6
+++ graphics/vulkan-loader/distinfo 17 Mar 2022 12:11:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (Vulkan-Loader-sdk-1.2.198.0.tar.gz) =
fV1WKW3NiK+E7Q/elpA4NwyshgDE734yh4i3Qi2QJbs=
-SIZE (Vulkan-Loader-sdk-1.2.198.0.tar.gz) = 1440922
+SHA256 (Vulkan-Loader-sdk-1.3.204.1.tar.gz) =
Xc1CtWSAT0wBiR3dQppKUCgRPEzzm0QlZono9UN3MTQ=
+SIZE (Vulkan-Loader-sdk-1.3.204.1.tar.gz) = 1465881
Index: graphics/vulkan-loader/patches/patch-loader_loader_c
===================================================================
RCS file: graphics/vulkan-loader/patches/patch-loader_loader_c
diff -N graphics/vulkan-loader/patches/patch-loader_loader_c
--- graphics/vulkan-loader/patches/patch-loader_loader_c 11 Mar 2022
19:23:30 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,61 +0,0 @@
-revert commit ecb0b1e69fb2f4d3cae262e6da24c170ce62ae13 to attempt to
-fix vulkaninfo
-
-Index: loader/loader.c
---- loader/loader.c.orig
-+++ loader/loader.c
-@@ -6232,52 +6232,11 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_EnumerateDev
- struct loader_extension_list all_exts = {0};
- struct loader_extension_list icd_exts = {0};
-
-+ assert(pLayerName == NULL || strlen(pLayerName) == 0);
-+
- // Any layer or trampoline wrapping should be removed at this point in
time can just cast to the expected
- // type for VkPhysicalDevice.
- phys_dev_term = (struct loader_physical_device_term *)physicalDevice;
--
-- // if we got here with a non-empty pLayerName, look up the extensions
-- // from the json
-- if (pLayerName != NULL && strlen(pLayerName) > 0) {
-- uint32_t count;
-- uint32_t copy_size;
-- const struct loader_instance *inst =
phys_dev_term->this_icd_term->this_instance;
-- struct loader_device_extension_list *dev_ext_list = NULL;
-- struct loader_device_extension_list local_ext_list;
-- memset(&local_ext_list, 0, sizeof(local_ext_list));
-- if (vk_string_validate(MaxLoaderStringLength, pLayerName) ==
VK_STRING_ERROR_NONE) {
-- for (uint32_t i = 0; i < inst->instance_layer_list.count; i++) {
-- struct loader_layer_properties *props =
&inst->instance_layer_list.list[i];
-- if (strcmp(props->info.layerName, pLayerName) == 0) {
-- dev_ext_list = &props->device_extension_list;
-- }
-- }
--
-- count = (dev_ext_list == NULL) ? 0 : dev_ext_list->count;
-- if (pProperties == NULL) {
-- *pPropertyCount = count;
-- loader_destroy_generic_list(inst, (struct loader_generic_list
*)&local_ext_list);
-- return VK_SUCCESS;
-- }
--
-- copy_size = *pPropertyCount < count ? *pPropertyCount : count;
-- for (uint32_t i = 0; i < copy_size; i++) {
-- memcpy(&pProperties[i], &dev_ext_list->list[i].props,
sizeof(VkExtensionProperties));
-- }
-- *pPropertyCount = copy_size;
--
-- loader_destroy_generic_list(inst, (struct loader_generic_list
*)&local_ext_list);
-- if (copy_size < count) {
-- return VK_INCOMPLETE;
-- }
-- } else {
-- loader_log(inst, VULKAN_LOADER_ERROR_BIT, 0,
-- "vkEnumerateDeviceExtensionProperties: pLayerName is
too long or is badly formed");
-- return VK_ERROR_EXTENSION_NOT_PRESENT;
-- }
--
-- return VK_SUCCESS;
-- }
-
- // This case is during the call down the instance chain with pLayerName
== NULL
- struct loader_icd_term *icd_term = phys_dev_term->this_icd_term;
Index: graphics/vulkan-loader/patches/patch-loader_trampoline_c
===================================================================
RCS file: graphics/vulkan-loader/patches/patch-loader_trampoline_c
diff -N graphics/vulkan-loader/patches/patch-loader_trampoline_c
--- graphics/vulkan-loader/patches/patch-loader_trampoline_c 11 Mar 2022
19:23:30 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,75 +0,0 @@
-revert commit ecb0b1e69fb2f4d3cae262e6da24c170ce62ae13 to attempt to
-fix vulkaninfo
-
-Index: loader/trampoline.c
---- loader/trampoline.c.orig
-+++ loader/trampoline.c
-@@ -815,17 +815,61 @@ LOADER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumera
-
VkExtensionProperties *pProperties) {
- VkResult res = VK_SUCCESS;
- struct loader_physical_device_tramp *phys_dev;
-- const VkLayerInstanceDispatchTable *disp;
- phys_dev = (struct loader_physical_device_tramp *)physicalDevice;
-
- loader_platform_thread_lock_mutex(&loader_lock);
-
-- // always pass this call down the instance chain which will terminate
-- // in the ICD. This allows layers to filter the extensions coming back
-- // up the chain. In the terminator we look up layer extensions from the
-- // manifest file if it wasn't provided by the layer itself.
-- disp = loader_get_instance_layer_dispatch(physicalDevice);
-- res = disp->EnumerateDeviceExtensionProperties(phys_dev->phys_dev,
pLayerName, pPropertyCount, pProperties);
-+ // If pLayerName == NULL, then querying ICD extensions, pass this call
-+ // down the instance chain which will terminate in the ICD. This allows
-+ // layers to filter the extensions coming back up the chain.
-+ // If pLayerName != NULL then get layer extensions from manifest file.
-+ if (pLayerName == NULL || strlen(pLayerName) == 0) {
-+ const VkLayerInstanceDispatchTable *disp;
-+
-+ disp = loader_get_instance_layer_dispatch(physicalDevice);
-+ res = disp->EnumerateDeviceExtensionProperties(phys_dev->phys_dev,
NULL, pPropertyCount, pProperties);
-+ } else {
-+ uint32_t count;
-+ uint32_t copy_size;
-+ const struct loader_instance *inst = phys_dev->this_instance;
-+ struct loader_device_extension_list *dev_ext_list = NULL;
-+ struct loader_device_extension_list local_ext_list;
-+ memset(&local_ext_list, 0, sizeof(local_ext_list));
-+ if (vk_string_validate(MaxLoaderStringLength, pLayerName) ==
VK_STRING_ERROR_NONE) {
-+ for (uint32_t i = 0; i < inst->instance_layer_list.count; i++) {
-+ struct loader_layer_properties *props =
&inst->instance_layer_list.list[i];
-+ if (strcmp(props->info.layerName, pLayerName) == 0) {
-+ dev_ext_list = &props->device_extension_list;
-+ }
-+ }
-+
-+ count = (dev_ext_list == NULL) ? 0 : dev_ext_list->count;
-+ if (pProperties == NULL) {
-+ *pPropertyCount = count;
-+ loader_destroy_generic_list(inst, (struct loader_generic_list
*)&local_ext_list);
-+ loader_platform_thread_unlock_mutex(&loader_lock);
-+ return VK_SUCCESS;
-+ }
-+
-+ copy_size = *pPropertyCount < count ? *pPropertyCount : count;
-+ for (uint32_t i = 0; i < copy_size; i++) {
-+ memcpy(&pProperties[i], &dev_ext_list->list[i].props,
sizeof(VkExtensionProperties));
-+ }
-+ *pPropertyCount = copy_size;
-+
-+ loader_destroy_generic_list(inst, (struct loader_generic_list
*)&local_ext_list);
-+ if (copy_size < count) {
-+ loader_platform_thread_unlock_mutex(&loader_lock);
-+ return VK_INCOMPLETE;
-+ }
-+ } else {
-+ loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0,
-+ "vkEnumerateDeviceExtensionProperties: pLayerName "
-+ "is too long or is badly formed");
-+ loader_platform_thread_unlock_mutex(&loader_lock);
-+ return VK_ERROR_EXTENSION_NOT_PRESENT;
-+ }
-+ }
-
- loader_platform_thread_unlock_mutex(&loader_lock);
- return res;
Index: graphics/vulkan-tools/Makefile
===================================================================
RCS file: /cvs/ports/graphics/vulkan-tools/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- graphics/vulkan-tools/Makefile 11 Mar 2022 19:23:31 -0000 1.11
+++ graphics/vulkan-tools/Makefile 17 Mar 2022 12:11:00 -0000
@@ -1,6 +1,6 @@
COMMENT = Vulkan Utilities and Tools
-V = 1.2.198.0
+V = 1.3.204.1
PKGNAME = vulkan-tools-${V}
GH_TAGNAME = sdk-${V}
GH_ACCOUNT = KhronosGroup
Index: graphics/vulkan-tools/distinfo
===================================================================
RCS file: /cvs/ports/graphics/vulkan-tools/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- graphics/vulkan-tools/distinfo 9 Dec 2021 04:48:32 -0000 1.6
+++ graphics/vulkan-tools/distinfo 17 Mar 2022 12:11:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (Vulkan-Tools-sdk-1.2.198.0.tar.gz) =
BuF0vKeDTfc9xs48KnKrO8NLY+Fv25pIa/ExXwJ2gDI=
-SIZE (Vulkan-Tools-sdk-1.2.198.0.tar.gz) = 847429
+SHA256 (Vulkan-Tools-sdk-1.3.204.1.tar.gz) =
MkL5rRWNAq+cxEGGy9QVmCOHNWot2MBJKvL9rOjCL0k=
+SIZE (Vulkan-Tools-sdk-1.3.204.1.tar.gz) = 860458
Index: graphics/vulkan-tools/patches/patch-cube_cube_cpp
===================================================================
RCS file: /cvs/ports/graphics/vulkan-tools/patches/patch-cube_cube_cpp,v
retrieving revision 1.6
diff -u -p -r1.6 patch-cube_cube_cpp
--- graphics/vulkan-tools/patches/patch-cube_cube_cpp 11 Mar 2022 19:23:31
-0000 1.6
+++ graphics/vulkan-tools/patches/patch-cube_cube_cpp 17 Mar 2022 12:11:00
-0000
@@ -1,7 +1,7 @@
Index: cube/cube.cpp
--- cube/cube.cpp.orig
+++ cube/cube.cpp
-@@ -3256,7 +3256,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPre
+@@ -3269,7 +3269,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPre
return (int)msg.wParam;
}
Index: graphics/vulkan-tools/patches/patch-vulkaninfo_vulkaninfo_h
===================================================================
RCS file:
/cvs/ports/graphics/vulkan-tools/patches/patch-vulkaninfo_vulkaninfo_h,v
retrieving revision 1.5
diff -u -p -r1.5 patch-vulkaninfo_vulkaninfo_h
--- graphics/vulkan-tools/patches/patch-vulkaninfo_vulkaninfo_h 11 Mar 2022
19:23:31 -0000 1.5
+++ graphics/vulkan-tools/patches/patch-vulkaninfo_vulkaninfo_h 17 Mar 2022
12:11:00 -0000
@@ -10,7 +10,7 @@ Index: vulkaninfo/vulkaninfo.h
#include <dlfcn.h>
#endif
-@@ -262,7 +262,7 @@ auto GetVector(const char *func_name, F &&f, Ts &&...
+@@ -244,7 +244,7 @@ auto GetVector(const char *func_name, F &&f, Ts &&...t
// ----------- Instance Setup ------- //
struct VkDll {
VkResult Initialize() {
@@ -19,7 +19,7 @@ Index: vulkaninfo/vulkaninfo.h
library = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL);
if (!library) library = dlopen("libvulkan.so.1", RTLD_NOW |
RTLD_LOCAL);
#elif defined(_WIN32)
-@@ -274,7 +274,7 @@ struct VkDll {
+@@ -256,7 +256,7 @@ struct VkDll {
return VK_SUCCESS;
}
void Close() {
@@ -28,7 +28,7 @@ Index: vulkaninfo/vulkaninfo.h
dlclose(library);
#elif defined(_WIN32)
FreeLibrary(library);
-@@ -429,13 +429,13 @@ struct VkDll {
+@@ -411,13 +411,13 @@ struct VkDll {
private:
template <typename T>
void Load(T &func_dest, const char *func_name) {
@@ -44,7 +44,7 @@ Index: vulkaninfo/vulkaninfo.h
void *library;
#elif defined(_WIN32)
HMODULE library;
-@@ -1765,4 +1765,4 @@ std::unordered_map<PropFlags, std::vector<VkFormat>> F
+@@ -1747,4 +1747,4 @@ std::unordered_map<PropFlags, std::vector<VkFormat>> F
}
}
return map;
Index: graphics/vulkan-validation-layers/Makefile
===================================================================
RCS file: /cvs/ports/graphics/vulkan-validation-layers/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- graphics/vulkan-validation-layers/Makefile 11 Mar 2022 19:23:31 -0000
1.13
+++ graphics/vulkan-validation-layers/Makefile 17 Mar 2022 12:11:00 -0000
@@ -1,11 +1,10 @@
COMMENT = Vulkan Validation Layers
-V = 1.2.198.0
+V = 1.3.204.1
PKGNAME = vulkan-validation-layers-${V}
GH_TAGNAME = sdk-${V}
GH_ACCOUNT = KhronosGroup
GH_PROJECT = Vulkan-ValidationLayers
-REVISION = 0
CATEGORIES = devel graphics
@@ -25,13 +24,11 @@ MODULES = devel/cmake \
MODPY_RUNDEP = No
BUILD_DEPENDS = devel/robin-hood-hashing \
- graphics/glslang \
graphics/vulkan-headers \
graphics/spirv-headers \
graphics/spirv-tools
-CONFIGURE_ARGS += -DGLSLANG_INSTALL_DIR="${LOCALBASE}" \
- -DBUILD_WSI_WAYLAND_SUPPORT=False \
+CONFIGURE_ARGS += -DBUILD_WSI_WAYLAND_SUPPORT=False \
-DSPIRV_HEADERS_INSTALL_DIR=${LOCALBASE}/include/spirv \
-DBUILD_WERROR=False
Index: graphics/vulkan-validation-layers/distinfo
===================================================================
RCS file: /cvs/ports/graphics/vulkan-validation-layers/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- graphics/vulkan-validation-layers/distinfo 9 Dec 2021 04:48:32 -0000
1.6
+++ graphics/vulkan-validation-layers/distinfo 17 Mar 2022 12:11:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (Vulkan-ValidationLayers-sdk-1.2.198.0.tar.gz) =
SnDMXaJrr4c/z2mwge7tpUVRXdZuWQTxj+4ytNJ1WTo=
-SIZE (Vulkan-ValidationLayers-sdk-1.2.198.0.tar.gz) = 3555293
+SHA256 (Vulkan-ValidationLayers-sdk-1.3.204.1.tar.gz) =
peZYpMH1BK44SIrNviqyeZ4q5LYmEE12d28cJLB580E=
+SIZE (Vulkan-ValidationLayers-sdk-1.3.204.1.tar.gz) = 3657199
Index: graphics/vulkan-validation-layers/patches/patch-CMakeLists_txt
===================================================================
RCS file:
/cvs/ports/graphics/vulkan-validation-layers/patches/patch-CMakeLists_txt,v
retrieving revision 1.6
diff -u -p -r1.6 patch-CMakeLists_txt
--- graphics/vulkan-validation-layers/patches/patch-CMakeLists_txt 11 Mar
2022 19:23:31 -0000 1.6
+++ graphics/vulkan-validation-layers/patches/patch-CMakeLists_txt 17 Mar
2022 12:11:00 -0000
@@ -1,7 +1,9 @@
+fix robin-hood-hashing detection
+
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -153,6 +153,7 @@ if(UNIX AND NOT APPLE) # i.e. Linux
+@@ -167,6 +167,7 @@ if(UNIX AND NOT APPLE) # i.e. Linux
if(BUILD_WSI_XCB_SUPPORT)
find_package(XCB REQUIRED)
@@ -9,3 +11,25 @@ Index: CMakeLists.txt
endif()
if(BUILD_WSI_XLIB_SUPPORT)
+@@ -251,9 +252,10 @@ option(BUILD_LAYERS "Build layers" ON)
+ option(BUILD_LAYER_SUPPORT_FILES "Generate layer files" OFF) # For generating
files when not building layers
+ option(USE_ROBIN_HOOD_HASHING "Use robin-hood-hashing" ON)
+ if (USE_ROBIN_HOOD_HASHING)
+- if (NOT TARGET robin_hood::robin_hood)
+- find_package(robin_hood REQUIRED CONFIG)
++ if(NOT ROBIN_HOOD_HASHING_INSTALL_DIR)
++ set(ROBIN_HOOD_HASHING_INSTALL_DIR
$ENV{ROBIN_HOOD_HASHING_INSTALL_DIR} PATH "Path to robin-hood-hashing
repository")
+ endif()
++ set(ROBIN_HOOD_HASHING_INCLUDE_DIR
"${ROBIN_HOOD_HASHING_INSTALL_DIR}/src/include" PATH "Path to
robin-hood-hashing/src/include")
+ endif()
+
+ if(BUILD_LAYERS OR BUILD_TESTS)
+@@ -383,7 +385,7 @@ target_include_directories(VkLayer_utils
+ ${VulkanHeaders_INCLUDE_DIR})
+
+ if (USE_ROBIN_HOOD_HASHING)
+- target_link_libraries(VkLayer_utils PUBLIC robin_hood::robin_hood)
++ target_include_directories(VkLayer_utils PUBLIC
${ROBIN_HOOD_HASHING_INCLUDE_DIR})
+ target_compile_definitions(VkLayer_utils PUBLIC USE_ROBIN_HOOD_HASHING)
+ endif()
+
Index:
graphics/vulkan-validation-layers/patches/patch-layers_best_practices_utils_cpp
===================================================================
RCS file:
/cvs/ports/graphics/vulkan-validation-layers/patches/patch-layers_best_practices_utils_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-layers_best_practices_utils_cpp
---
graphics/vulkan-validation-layers/patches/patch-layers_best_practices_utils_cpp
11 Mar 2022 19:23:31 -0000 1.2
+++
graphics/vulkan-validation-layers/patches/patch-layers_best_practices_utils_cpp
17 Mar 2022 12:11:00 -0000
@@ -4,8 +4,8 @@ Index: layers/best_practices_utils.cpp
--- layers/best_practices_utils.cpp.orig
+++ layers/best_practices_utils.cpp
@@ -376,8 +376,8 @@ IMAGE_STATE_BP* BestPractices::GetImageUsageState(VkIm
- IMAGE_STATE* image = Get<IMAGE_STATE>(vk_image);
- state.image = image;
+ auto image = Get<IMAGE_STATE>(vk_image);
+ state.image = image.get();
state.usages.resize(image->createInfo.arrayLayers);
- for (auto& mips : state.usages) {
- mips.resize(image->createInfo.mipLevels,
IMAGE_SUBRESOURCE_USAGE_BP::UNDEFINED);
