diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile index a103cb5e6d09..de48f5aebbe4 100644 --- a/graphics/vulkan-validation-layers/Makefile +++ b/graphics/vulkan-validation-layers/Makefile @@ -1,46 +1,45 @@ PORTNAME= vulkan-validation-layers -DISTVERSIONPREFIX= sdk- -DISTVERSION= 1.2.182.0 -PORTREVISION= 1 +DISTVERSIONPREFIX= v +DISTVERSION= 1.2.184 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= Validation layers for the Vulkan graphics API LICENSE= APACHE20 BUILD_DEPENDS= glslang>0:graphics/glslang \ spirv-tools>0:graphics/spirv-tools \ vulkan-headers>0:graphics/vulkan-headers USES= cmake compiler:c++11-lib pkgconfig python:3.4+,build USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-ValidationLayers GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-71-g07f259e:headers/external/spirv-headers \ martinus:robin-hood-hashing:3.10.0:robin_hood/external/robin-hood-hashing CMAKE_OFF= BUILD_TESTS CMAKE_ON= BUILD_LAYER_SUPPORT_FILES CMAKE_ARGS= -DGLSLANG_INSTALL_DIR:PATH="${LOCALBASE}" \ -DROBIN_HOOD_HASHING_INSTALL_DIR:PATH="${WRKSRC_robin_hood}" \ -DSPIRV_HEADERS_INSTALL_DIR:PATH="${WRKSRC_headers}" CFLAGS+= ${WITH_DEBUG:U-DNDEBUG} OPTIONS_DEFINE= WAYLAND XCB XLIB OPTIONS_DEFAULT=WAYLAND XCB XLIB WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland WAYLAND_CMAKE_BOOL= BUILD_WSI_WAYLAND_SUPPORT XCB_DESC= ${X11_DESC} via libxcb XCB_USES= xorg XCB_USE= XORG=xcb XCB_CMAKE_BOOL= BUILD_WSI_XCB_SUPPORT XLIB_DESC= ${X11_DESC} via libX11 XLIB_USES= xorg XLIB_USE= XORG=x11,xrandr XLIB_CMAKE_BOOL= BUILD_WSI_XLIB_SUPPORT .include diff --git a/graphics/vulkan-validation-layers/distinfo b/graphics/vulkan-validation-layers/distinfo index 40e562c83852..ef5e85424682 100644 --- a/graphics/vulkan-validation-layers/distinfo +++ b/graphics/vulkan-validation-layers/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1625164619 -SHA256 (KhronosGroup-Vulkan-ValidationLayers-sdk-1.2.182.0_GH0.tar.gz) = e88492143c8b08154807e7ead0ac784365b14464bb5016c2800cbff176ff61e7 -SIZE (KhronosGroup-Vulkan-ValidationLayers-sdk-1.2.182.0_GH0.tar.gz) = 2794981 +TIMESTAMP = 1625608724 +SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.2.184_GH0.tar.gz) = 14c8e0da0a995677c7271992b19fe87dba25f0003c7a090de4c54c736bbb9fc7 +SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.2.184_GH0.tar.gz) = 2799109 SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-71-g07f259e_GH0.tar.gz) = 1561e1442638acb5746f5d9b3537bdf31498f91a07d0902be5277a4877adacc7 SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-71-g07f259e_GH0.tar.gz) = 412265 SHA256 (martinus-robin-hood-hashing-3.10.0_GH0.tar.gz) = 15f031c3ab7c13addfb19bd495be6f12ac8843111b71b61873ef6fa981bfc4da SIZE (martinus-robin-hood-hashing-3.10.0_GH0.tar.gz) = 169078 diff --git a/graphics/vulkan-validation-layers/files/patch-headers-1.2.183 b/graphics/vulkan-validation-layers/files/patch-headers-1.2.183 deleted file mode 100644 index 22c60efdcac4..000000000000 --- a/graphics/vulkan-validation-layers/files/patch-headers-1.2.183 +++ /dev/null @@ -1,45 +0,0 @@ -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"); -