Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 3 Nov 2021 22:00:29 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: d468ffc18df5 - main - graphics/vulkan-validation-layers: update to 1.2.197
Message-ID:  <202111032200.1A3M0TSO061188@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d468ffc18df529b64fc04c4ce2dba3eeb7b30ca6

commit d468ffc18df529b64fc04c4ce2dba3eeb7b30ca6
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-11-03 19:03:46 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-11-03 21:59:20 +0000

    graphics/vulkan-validation-layers: update to 1.2.197
    
    Changes:        https://github.com/KhronosGroup/Vulkan-ValidationLayers/compare/v1.2.196...v1.2.197
    Reported by:    portscout
---
 graphics/spirv-tools/Makefile                      |  6 ++
 graphics/spirv-tools/distinfo                      |  6 ++
 graphics/vulkan-validation-layers/Makefile         |  2 +-
 graphics/vulkan-validation-layers/distinfo         |  6 +-
 .../files/patch-headers-1.2.197                    | 90 ----------------------
 5 files changed, 16 insertions(+), 94 deletions(-)

diff --git a/graphics/spirv-tools/Makefile b/graphics/spirv-tools/Makefile
index 17be8f082c30..1fc189bde981 100644
--- a/graphics/spirv-tools/Makefile
+++ b/graphics/spirv-tools/Makefile
@@ -1,8 +1,14 @@
 PORTNAME=	spirv-tools
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2021.3
+PORTREVISION=	1
 CATEGORIES=	graphics
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	ee30773650ec.patch:-p1 # https://github.com/KhronosGroup/SPIRV-Tools/pull/4492
+PATCHFILES+=	bd3a271ce3fc.patch:-p1 # https://github.com/KhronosGroup/SPIRV-Tools/pull/4495
+PATCHFILES+=	4ac8e5e541ea.patch:-p1 # https://github.com/KhronosGroup/SPIRV-Tools/pull/4520
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Tools for processing SPIR-V intermediate shader language modules
 
diff --git a/graphics/spirv-tools/distinfo b/graphics/spirv-tools/distinfo
index 1e0c8f49290b..a92031f2386e 100644
--- a/graphics/spirv-tools/distinfo
+++ b/graphics/spirv-tools/distinfo
@@ -3,3 +3,9 @@ SHA256 (KhronosGroup-SPIRV-Tools-v2021.3_GH0.tar.gz) = b6b4194121ee8084c62b20f8d
 SIZE (KhronosGroup-SPIRV-Tools-v2021.3_GH0.tar.gz) = 2847869
 SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-98-g449bc98_GH0.tar.gz) = 6911ebf451c92c6a350b99d706cbe702a646fb3b29439f28f98502eed2d81616
 SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-98-g449bc98_GH0.tar.gz) = 414832
+SHA256 (ee30773650ec.patch) = a2695a75cd88b87c965be01d8023b2967bd426bd3ecb835cc1a5084f9ae00f30
+SIZE (ee30773650ec.patch) = 7798
+SHA256 (bd3a271ce3fc.patch) = d4915afdb766cb05c1e50f7687d7dda849ba3f27e4e5f6d106c17f8bc5c294e3
+SIZE (bd3a271ce3fc.patch) = 7412
+SHA256 (4ac8e5e541ea.patch) = fdd22c8959eab6a7fbecfc72618c1d23ca34a9e6365041d45b8f74fe028758e1
+SIZE (4ac8e5e541ea.patch) = 8606
diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile
index 43085a52217e..6e701156048a 100644
--- a/graphics/vulkan-validation-layers/Makefile
+++ b/graphics/vulkan-validation-layers/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	vulkan-validation-layers
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.2.196
+DISTVERSION=	1.2.197
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/graphics/vulkan-validation-layers/distinfo b/graphics/vulkan-validation-layers/distinfo
index 423b589cb360..9412fa9d3c25 100644
--- a/graphics/vulkan-validation-layers/distinfo
+++ b/graphics/vulkan-validation-layers/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1634250871
-SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.2.196_GH0.tar.gz) = b8003a726d1d102d8cce8c9e200dbaff582c431b525537a412afc2a4f993bde2
-SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.2.196_GH0.tar.gz) = 3472448
+TIMESTAMP = 1635966226
+SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.2.197_GH0.tar.gz) = 8673d4dc6a8ebd8234f0ddd72aeeb4829231d27a2c8249cafd33fb38c602464b
+SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.2.197_GH0.tar.gz) = 3545972
 SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-98-g449bc98_GH0.tar.gz) = 6911ebf451c92c6a350b99d706cbe702a646fb3b29439f28f98502eed2d81616
 SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-98-g449bc98_GH0.tar.gz) = 414832
 SHA256 (martinus-robin-hood-hashing-3.11.3_GH0.tar.gz) = dcf2b7fa9ef9dd0c67102d94c28e8df3effbe1845e0ed1f31f4772ca5e857fc4
diff --git a/graphics/vulkan-validation-layers/files/patch-headers-1.2.197 b/graphics/vulkan-validation-layers/files/patch-headers-1.2.197
deleted file mode 100644
index 6f6af9d71f3e..000000000000
--- a/graphics/vulkan-validation-layers/files/patch-headers-1.2.197
+++ /dev/null
@@ -1,90 +0,0 @@
-https://github.com/KhronosGroup/Vulkan-ValidationLayers/commit/def5cf6be051
-
-In file included from layers/vk_layer_config.cpp:38:
-In file included from layers/vk_layer_utils.h:33:
-In file included from layers/vk_layer_logging.h:49:
-layers/generated/vk_enum_string_helper.h:7149:73: error: unknown type name 'VkVideoEncodeH265CapabilityFlagBitsEXT'; did you mean 'VkVideoEncodeH264CapabilityFlagBitsEXT'?
-static inline const char* string_VkVideoEncodeH265CapabilityFlagBitsEXT(VkVideoEncodeH265CapabilityFlagBitsEXT input_value)
-                                                                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-layers/generated/parameter_validation.cpp:128:87: error: use of undeclared identifier 'VK_VIDEO_ENCODE_H265_CAPABILITY_WEIGHTED_BI_PRED_IMPLICIT_BIT_EXT'; did you mean 'VK_VIDEO_ENCODE_H264_CAPABILITY_WEIGHTED_BI_PRED_IMPLICIT_BIT_EXT'?
-const VkVideoEncodeH265CapabilityFlagsEXT AllVkVideoEncodeH265CapabilityFlagBitsEXT = VK_VIDEO_ENCODE_H265_CAPABILITY_WEIGHTED_BI_PRED_IMPLICIT_BIT_EXT|VK_VIDEO_ENCODE_H265_CAPABILITY_TRANSFORM_8X8_BIT_EXT|VK_VIDEO_ENCODE_H265_CAPABILITY_CHROMA_QP_OFFSET_BIT_EXT|VK_VIDEO_ENCODE_H265_CAPABILITY_SECOND_CHROMA_QP_OFFSET_BIT_EXT|VK_VIDEO_ENCODE_H265_CAPABILITY_DEBLOCKING_FILTER_DISABLED_BIT_EXT|VK_VIDEO_ENCODE_H265_CAPABILITY_DEBLOCKING_FILTER_ENABLED_BIT_EXT|VK_VIDEO_ENCODE_H265_CAPABILITY_DEBLOCKING_FILTER_PARTIAL_BIT_EXT|VK_VIDEO_ENCODE_H265_CAPABILITY_MULTIPLE_SLICE_PER_FRAME_BIT_EXT|VK_VIDEO_ENCODE_H265_CAPABILITY_EVENLY_DISTRIBUTED_SLICE_SIZE_BIT_EXT;
-                                                                                      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
---- layers/generated/parameter_validation.cpp.orig	2021-10-14 22:34:31 UTC
-+++ layers/generated/parameter_validation.cpp
-@@ -125,9 +125,6 @@ const VkVideoEncodeH264InputModeFlagsEXT AllVkVideoEnc
- const VkVideoEncodeH264OutputModeFlagsEXT AllVkVideoEncodeH264OutputModeFlagBitsEXT = VK_VIDEO_ENCODE_H264_OUTPUT_MODE_FRAME_BIT_EXT|VK_VIDEO_ENCODE_H264_OUTPUT_MODE_SLICE_BIT_EXT|VK_VIDEO_ENCODE_H264_OUTPUT_MODE_NON_VCL_BIT_EXT;
- #endif
- #ifdef VK_ENABLE_BETA_EXTENSIONS
--const VkVideoEncodeH265CapabilityFlagsEXT AllVkVideoEncodeH265CapabilityFlagBitsEXT = VK_VIDEO_ENCODE_H265_CAPABILITY_WEIGHTED_BI_PRED_IMPLICIT_BIT_EXT|VK_VIDEO_ENCODE_H265_CAPABILITY_TRANSFORM_8X8_BIT_EXT|VK_VIDEO_ENCODE_H265_CAPABILITY_CHROMA_QP_OFFSET_BIT_EXT|VK_VIDEO_ENCODE_H265_CAPABILITY_SECOND_CHROMA_QP_OFFSET_BIT_EXT|VK_VIDEO_ENCODE_H265_CAPABILITY_DEBLOCKING_FILTER_DISABLED_BIT_EXT|VK_VIDEO_ENCODE_H265_CAPABILITY_DEBLOCKING_FILTER_ENABLED_BIT_EXT|VK_VIDEO_ENCODE_H265_CAPABILITY_DEBLOCKING_FILTER_PARTIAL_BIT_EXT|VK_VIDEO_ENCODE_H265_CAPABILITY_MULTIPLE_SLICE_PER_FRAME_BIT_EXT|VK_VIDEO_ENCODE_H265_CAPABILITY_EVENLY_DISTRIBUTED_SLICE_SIZE_BIT_EXT;
--#endif
--#ifdef VK_ENABLE_BETA_EXTENSIONS
- const VkVideoEncodeH265CtbSizeFlagsEXT AllVkVideoEncodeH265CtbSizeFlagBitsEXT = VK_VIDEO_ENCODE_H265_CTB_SIZE_8_BIT_EXT|VK_VIDEO_ENCODE_H265_CTB_SIZE_16_BIT_EXT|VK_VIDEO_ENCODE_H265_CTB_SIZE_32_BIT_EXT|VK_VIDEO_ENCODE_H265_CTB_SIZE_64_BIT_EXT;
- #endif
- #ifdef VK_ENABLE_BETA_EXTENSIONS
-@@ -2526,7 +2523,7 @@ bool StatelessValidation::ValidatePnextStructContents(
-         case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_CAPABILITIES_EXT: { // Covers VUID-VkVideoEncodeH265CapabilitiesEXT-sType-sType
-             if (is_const_param) {
-                 VkVideoEncodeH265CapabilitiesEXT *structure = (VkVideoEncodeH265CapabilitiesEXT *) header;
--                skip |= validate_flags("VkVideoEncodeH265CapabilitiesEXT", "flags", "VkVideoEncodeH265CapabilityFlagBitsEXT", AllVkVideoEncodeH265CapabilityFlagBitsEXT, structure->flags, kRequiredFlags, "VUID-VkVideoEncodeH265CapabilitiesEXT-flags-parameter", "VUID-VkVideoEncodeH265CapabilitiesEXT-flags-requiredbitmask");
-+                skip |= validate_reserved_flags("VkVideoEncodeH265CapabilitiesEXT", "flags", structure->flags, "VUID-VkVideoEncodeH265CapabilitiesEXT-flags-zerobitmask");
- 
-                 skip |= validate_flags("VkVideoEncodeH265CapabilitiesEXT", "inputModeFlags", "VkVideoEncodeH265InputModeFlagBitsEXT", AllVkVideoEncodeH265InputModeFlagBitsEXT, structure->inputModeFlags, kRequiredFlags, "VUID-VkVideoEncodeH265CapabilitiesEXT-inputModeFlags-parameter", "VUID-VkVideoEncodeH265CapabilitiesEXT-inputModeFlags-requiredbitmask");
- 
---- layers/generated/vk_enum_string_helper.h.orig	2021-10-14 22:34:31 UTC
-+++ layers/generated/vk_enum_string_helper.h
-@@ -7146,53 +7146,6 @@ static inline std::string string_VkVideoEncodeH264Crea
- 
- #ifdef VK_ENABLE_BETA_EXTENSIONS
- 
--static inline const char* string_VkVideoEncodeH265CapabilityFlagBitsEXT(VkVideoEncodeH265CapabilityFlagBitsEXT input_value)
--{
--    switch (input_value)
--    {
--        case VK_VIDEO_ENCODE_H265_CAPABILITY_CHROMA_QP_OFFSET_BIT_EXT:
--            return "VK_VIDEO_ENCODE_H265_CAPABILITY_CHROMA_QP_OFFSET_BIT_EXT";
--        case VK_VIDEO_ENCODE_H265_CAPABILITY_DEBLOCKING_FILTER_DISABLED_BIT_EXT:
--            return "VK_VIDEO_ENCODE_H265_CAPABILITY_DEBLOCKING_FILTER_DISABLED_BIT_EXT";
--        case VK_VIDEO_ENCODE_H265_CAPABILITY_DEBLOCKING_FILTER_ENABLED_BIT_EXT:
--            return "VK_VIDEO_ENCODE_H265_CAPABILITY_DEBLOCKING_FILTER_ENABLED_BIT_EXT";
--        case VK_VIDEO_ENCODE_H265_CAPABILITY_DEBLOCKING_FILTER_PARTIAL_BIT_EXT:
--            return "VK_VIDEO_ENCODE_H265_CAPABILITY_DEBLOCKING_FILTER_PARTIAL_BIT_EXT";
--        case VK_VIDEO_ENCODE_H265_CAPABILITY_EVENLY_DISTRIBUTED_SLICE_SIZE_BIT_EXT:
--            return "VK_VIDEO_ENCODE_H265_CAPABILITY_EVENLY_DISTRIBUTED_SLICE_SIZE_BIT_EXT";
--        case VK_VIDEO_ENCODE_H265_CAPABILITY_MULTIPLE_SLICE_PER_FRAME_BIT_EXT:
--            return "VK_VIDEO_ENCODE_H265_CAPABILITY_MULTIPLE_SLICE_PER_FRAME_BIT_EXT";
--        case VK_VIDEO_ENCODE_H265_CAPABILITY_SECOND_CHROMA_QP_OFFSET_BIT_EXT:
--            return "VK_VIDEO_ENCODE_H265_CAPABILITY_SECOND_CHROMA_QP_OFFSET_BIT_EXT";
--        case VK_VIDEO_ENCODE_H265_CAPABILITY_TRANSFORM_8X8_BIT_EXT:
--            return "VK_VIDEO_ENCODE_H265_CAPABILITY_TRANSFORM_8X8_BIT_EXT";
--        case VK_VIDEO_ENCODE_H265_CAPABILITY_WEIGHTED_BI_PRED_IMPLICIT_BIT_EXT:
--            return "VK_VIDEO_ENCODE_H265_CAPABILITY_WEIGHTED_BI_PRED_IMPLICIT_BIT_EXT";
--        default:
--            return "Unhandled VkVideoEncodeH265CapabilityFlagBitsEXT";
--    }
--}
--
--static inline std::string string_VkVideoEncodeH265CapabilityFlagsEXT(VkVideoEncodeH265CapabilityFlagsEXT input_value)
--{
--    std::string ret;
--    int index = 0;
--    while(input_value) {
--        if (input_value & 1) {
--            if( !ret.empty()) ret.append("|");
--            ret.append(string_VkVideoEncodeH265CapabilityFlagBitsEXT(static_cast<VkVideoEncodeH265CapabilityFlagBitsEXT>(1U << index)));
--        }
--        ++index;
--        input_value >>= 1;
--    }
--    if( ret.empty()) ret.append(string_VkVideoEncodeH265CapabilityFlagBitsEXT(static_cast<VkVideoEncodeH265CapabilityFlagBitsEXT>(0)));
--    return ret;
--}
--#endif // VK_ENABLE_BETA_EXTENSIONS
--
--
--#ifdef VK_ENABLE_BETA_EXTENSIONS
--
- static inline const char* string_VkVideoEncodeH265InputModeFlagBitsEXT(VkVideoEncodeH265InputModeFlagBitsEXT input_value)
- {
-     switch (input_value)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111032200.1A3M0TSO061188>