diff --git a/graphics/vulkan-headers/Makefile b/graphics/vulkan-headers/Makefile index 972c355cfa1a..84a1b22e6778 100644 --- a/graphics/vulkan-headers/Makefile +++ b/graphics/vulkan-headers/Makefile @@ -1,6 +1,6 @@ PORTNAME= vulkan-headers DISTVERSIONPREFIX= v -DISTVERSION= 1.2.182 +DISTVERSION= 1.2.183 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org diff --git a/graphics/vulkan-headers/distinfo b/graphics/vulkan-headers/distinfo index dbe5b13dba53..84e6c2a4f359 100644 --- a/graphics/vulkan-headers/distinfo +++ b/graphics/vulkan-headers/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1624260314 -SHA256 (KhronosGroup-Vulkan-Headers-v1.2.182_GH0.tar.gz) = 38d1c953de7bb2d839556226851feeb690f0d23bc22ac46c823dcb66c97bfdc8 -SIZE (KhronosGroup-Vulkan-Headers-v1.2.182_GH0.tar.gz) = 1162517 +TIMESTAMP = 1624868841 +SHA256 (KhronosGroup-Vulkan-Headers-v1.2.183_GH0.tar.gz) = 79d8ac82f9837a9c09d6149cae032a99a314c6aa506086f5f6c260c9190b8ef7 +SIZE (KhronosGroup-Vulkan-Headers-v1.2.183_GH0.tar.gz) = 1164482 diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index 240dc14cb942..e4f31c68b18c 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -1,6 +1,7 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX= v DISTVERSION= 1.2.182 +PORTREVISION= 1 CATEGORIES= graphics devel MAINTAINER= jbeich@FreeBSD.org diff --git a/graphics/vulkan-loader/pkg-plist b/graphics/vulkan-loader/pkg-plist index 5c424b7734a5..fc196b916ff6 100644 --- a/graphics/vulkan-loader/pkg-plist +++ b/graphics/vulkan-loader/pkg-plist @@ -1,4 +1,4 @@ lib/libvulkan.so lib/libvulkan.so.1 -lib/libvulkan.so.1.2.182 +lib/libvulkan.so.1.2.183 libdata/pkgconfig/vulkan.pc diff --git a/graphics/vulkan-validation-layers/files/patch-headers-1.2.183 b/graphics/vulkan-validation-layers/files/patch-headers-1.2.183 new file mode 100644 index 000000000000..22c60efdcac4 --- /dev/null +++ b/graphics/vulkan-validation-layers/files/patch-headers-1.2.183 @@ -0,0 +1,45 @@ +Part of https://github.com/KhronosGroup/Vulkan-ValidationLayers/commit/28198b569714 + +In file included from layers/generated/chassis.cpp:29: +In file included from layers/generated/chassis.h:41: +In file included from layers/vk_layer_logging.h:49: +layers/generated/vk_enum_string_helper.h:1107:14: error: use of undeclared identifier 'VK_STRUCTURE_TYPE_SUBPASSS_SHADING_PIPELINE_CREATE_INFO_HUAWEI'; did you mean 'VK_STRUCTURE_TYPE_SUBPASS_SHADING_PIPELINE_CREATE_INFO_HUAWEI'? + case VK_STRUCTURE_TYPE_SUBPASSS_SHADING_PIPELINE_CREATE_INFO_HUAWEI: + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + VK_STRUCTURE_TYPE_SUBPASS_SHADING_PIPELINE_CREATE_INFO_HUAWEI +/usr/local/include/vulkan/vulkan_core.h:828:5: note: 'VK_STRUCTURE_TYPE_SUBPASS_SHADING_PIPELINE_CREATE_INFO_HUAWEI' declared here + VK_STRUCTURE_TYPE_SUBPASS_SHADING_PIPELINE_CREATE_INFO_HUAWEI = 1000369000, + ^ + +layers/generated/parameter_validation.cpp:5110:208: error: use of undeclared identifier 'VK_STRUCTURE_TYPE_SUBPASSS_SHADING_PIPELINE_CREATE_INFO_HUAWEI'; did you mean 'VK_STRUCTURE_TYPE_SUBPASS_SHADING_PIPELINE_CREATE_INFO_HUAWEI'? + const VkStructureType allowed_structs_VkComputePipelineCreateInfo[] = { VK_STRUCTURE_TYPE_PIPELINE_COMPILER_CONTROL_CREATE_INFO_AMD, VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO_EXT, VK_STRUCTURE_TYPE_SUBPASSS_SHADING_PIPELINE_CREATE_INFO_HUAWEI }; + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + VK_STRUCTURE_TYPE_SUBPASS_SHADING_PIPELINE_CREATE_INFO_HUAWEI +/usr/local/include/vulkan/vulkan_core.h:828:5: note: 'VK_STRUCTURE_TYPE_SUBPASS_SHADING_PIPELINE_CREATE_INFO_HUAWEI' declared here + VK_STRUCTURE_TYPE_SUBPASS_SHADING_PIPELINE_CREATE_INFO_HUAWEI = 1000369000, + ^ + +--- layers/generated/vk_enum_string_helper.h.orig 2021-06-21 21:57:50 UTC ++++ layers/generated/vk_enum_string_helper.h +@@ -1104,8 +1104,8 @@ static inline const char* string_VkStructureType(VkStr + return "VK_STRUCTURE_TYPE_SUBMIT_INFO"; + case VK_STRUCTURE_TYPE_SUBMIT_INFO_2_KHR: + return "VK_STRUCTURE_TYPE_SUBMIT_INFO_2_KHR"; +- case VK_STRUCTURE_TYPE_SUBPASSS_SHADING_PIPELINE_CREATE_INFO_HUAWEI: +- return "VK_STRUCTURE_TYPE_SUBPASSS_SHADING_PIPELINE_CREATE_INFO_HUAWEI"; ++ case VK_STRUCTURE_TYPE_SUBPASS_SHADING_PIPELINE_CREATE_INFO_HUAWEI: ++ return "VK_STRUCTURE_TYPE_SUBPASS_SHADING_PIPELINE_CREATE_INFO_HUAWEI"; + case VK_STRUCTURE_TYPE_SUBPASS_BEGIN_INFO: + return "VK_STRUCTURE_TYPE_SUBPASS_BEGIN_INFO"; + case VK_STRUCTURE_TYPE_SUBPASS_DEPENDENCY_2: +--- layers/generated/parameter_validation.cpp~ 2021-06-21 21:57:50.000000000 +0000 ++++ layers/generated/parameter_validation.cpp 2021-07-01 00:39:30.820043758 +0000 +@@ -5107,7 +5107,7 @@ bool StatelessValidation::PreCallValidateCreateCompute + { + for (uint32_t createInfoIndex = 0; createInfoIndex < createInfoCount; ++createInfoIndex) + { +- const VkStructureType allowed_structs_VkComputePipelineCreateInfo[] = { VK_STRUCTURE_TYPE_PIPELINE_COMPILER_CONTROL_CREATE_INFO_AMD, VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO_EXT, VK_STRUCTURE_TYPE_SUBPASSS_SHADING_PIPELINE_CREATE_INFO_HUAWEI }; ++ const VkStructureType allowed_structs_VkComputePipelineCreateInfo[] = { VK_STRUCTURE_TYPE_PIPELINE_COMPILER_CONTROL_CREATE_INFO_AMD, VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO_EXT, VK_STRUCTURE_TYPE_SUBPASS_SHADING_PIPELINE_CREATE_INFO_HUAWEI }; + + skip |= validate_struct_pnext("vkCreateComputePipelines", ParameterName("pCreateInfos[%i].pNext", ParameterName::IndexVector{ createInfoIndex }), "VkPipelineCompilerControlCreateInfoAMD, VkPipelineCreationFeedbackCreateInfoEXT, VkSubpassShadingPipelineCreateInfoHUAWEI", pCreateInfos[createInfoIndex].pNext, ARRAY_SIZE(allowed_structs_VkComputePipelineCreateInfo), allowed_structs_VkComputePipelineCreateInfo, GeneratedVulkanHeaderVersion, "VUID-VkComputePipelineCreateInfo-pNext-pNext", "VUID-VkComputePipelineCreateInfo-sType-unique"); +