Date: Wed, 3 Nov 2021 22:00:26 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: a44d975ec087 - main - graphics/vulkan-headers: update to 1.2.197 Message-ID: <202111032200.1A3M0Q9N061112@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=a44d975ec08791188c8d5d34ab5e628763c54686 commit a44d975ec08791188c8d5d34ab5e628763c54686 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-11-02 17:01:53 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2021-11-03 21:59:19 +0000 graphics/vulkan-headers: update to 1.2.197 Force rebuild vulkan-loader to make sure vulkaninfo shows the new version. Changes: https://github.com/KhronosGroup/Vulkan-Headers/compare/v1.2.196...v1.2.197 Reported by: Repology --- .../warzone2100/files/patch-vulkan-headers-1.2.197 | 67 ++++++++++++++++ graphics/vulkan-headers/Makefile | 2 +- graphics/vulkan-headers/distinfo | 6 +- graphics/vulkan-loader/Makefile | 1 + .../files/patch-headers-1.2.197 | 90 ++++++++++++++++++++++ 5 files changed, 162 insertions(+), 4 deletions(-) diff --git a/games/warzone2100/files/patch-vulkan-headers-1.2.197 b/games/warzone2100/files/patch-vulkan-headers-1.2.197 new file mode 100644 index 000000000000..700428327986 --- /dev/null +++ b/games/warzone2100/files/patch-vulkan-headers-1.2.197 @@ -0,0 +1,67 @@ +lib/ivis_opengl/gfx_api_vk.cpp:480:3: error: use of undeclared identifier 'throwResultException'; did you mean 'vk::throwResultException'? + throwResultException( result, "vmaCreateBuffer" ); + ^~~~~~~~~~~~~~~~~~~~ + vk::throwResultException +/usr/local/include/vulkan/vulkan.hpp:6315:23: note: 'vk::throwResultException' declared here + [[noreturn]] void throwResultException( Result result, char const * message ) + ^ +lib/ivis_opengl/gfx_api_vk.cpp:1293:4: error: use of undeclared identifier 'throwResultException'; did you mean 'vk::throwResultException'? + throwResultException(result.result, "createGraphicsPipeline"); + ^~~~~~~~~~~~~~~~~~~~ + vk::throwResultException +/usr/local/include/vulkan/vulkan.hpp:6315:23: note: 'vk::throwResultException' declared here + [[noreturn]] void throwResultException( Result result, char const * message ) + ^ +lib/ivis_opengl/gfx_api_vk.cpp:1353:3: error: use of undeclared identifier 'throwResultException'; did you mean 'vk::throwResultException'? + throwResultException( result, "vmaCreateBuffer" ); + ^~~~~~~~~~~~~~~~~~~~ + vk::throwResultException +/usr/local/include/vulkan/vulkan.hpp:6315:23: note: 'vk::throwResultException' declared here + [[noreturn]] void throwResultException( Result result, char const * message ) + ^ +lib/ivis_opengl/gfx_api_vk.cpp:1460:3: error: use of undeclared identifier 'throwResultException'; did you mean 'vk::throwResultException'? + throwResultException( result, "vmaCreateImage" ); + ^~~~~~~~~~~~~~~~~~~~ + vk::throwResultException +/usr/local/include/vulkan/vulkan.hpp:6315:23: note: 'vk::throwResultException' declared here + [[noreturn]] void throwResultException( Result result, char const * message ) + ^ + +--- lib/ivis_opengl/gfx_api_vk.cpp.orig 2021-04-18 18:28:41 UTC ++++ lib/ivis_opengl/gfx_api_vk.cpp +@@ -477,7 +477,7 @@ void BlockBufferAllocator::allocateNewBlock(uint32_t m + if (result != vk::Result::eSuccess) + { + // Failed to allocate memory! +- throwResultException( result, "vmaCreateBuffer" ); ++ vk::throwResultException( result, "vmaCreateBuffer" ); + } + + if (autoMap) +@@ -1290,7 +1290,7 @@ VkPSO::VkPSO(vk::Device _dev, + object = std::move(result.value); + break; + default: +- throwResultException(result.result, "createGraphicsPipeline"); ++ vk::throwResultException(result.result, "createGraphicsPipeline"); + } + } + +@@ -1350,7 +1350,7 @@ void VkBuf::allocateBufferObject(const std::size_t& si + if (result != vk::Result::eSuccess) + { + // Failed to allocate memory! +- throwResultException( result, "vmaCreateBuffer" ); ++ vk::throwResultException( result, "vmaCreateBuffer" ); + } + + buffer_size = size; +@@ -1457,7 +1457,7 @@ VkTexture::VkTexture(const VkRoot& root, const std::si + if (result != vk::Result::eSuccess) + { + // Failed to allocate memory! +- throwResultException( result, "vmaCreateImage" ); ++ vk::throwResultException( result, "vmaCreateImage" ); + } + + const auto imageViewCreateInfo = vk::ImageViewCreateInfo() diff --git a/graphics/vulkan-headers/Makefile b/graphics/vulkan-headers/Makefile index eac70f272bbf..4f3f056cb2c6 100644 --- a/graphics/vulkan-headers/Makefile +++ b/graphics/vulkan-headers/Makefile @@ -1,6 +1,6 @@ PORTNAME= vulkan-headers DISTVERSIONPREFIX= v -DISTVERSION= 1.2.196 +DISTVERSION= 1.2.197 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org diff --git a/graphics/vulkan-headers/distinfo b/graphics/vulkan-headers/distinfo index 897ffde1b96d..f6c1c39425e7 100644 --- a/graphics/vulkan-headers/distinfo +++ b/graphics/vulkan-headers/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1634206300 -SHA256 (KhronosGroup-Vulkan-Headers-v1.2.196_GH0.tar.gz) = 33cb99194b5ab082beb00bda1e96311dfe2cb20b0037b6d4c8ae926a50f5a750 -SIZE (KhronosGroup-Vulkan-Headers-v1.2.196_GH0.tar.gz) = 1246143 +TIMESTAMP = 1635872513 +SHA256 (KhronosGroup-Vulkan-Headers-v1.2.197_GH0.tar.gz) = b5f306b2deff990563448827a96f9c8e8de86df591950a6b9cbd61d20936f3b4 +SIZE (KhronosGroup-Vulkan-Headers-v1.2.197_GH0.tar.gz) = 1287404 diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index 04331e9eff28..cba8b59a4359 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -1,6 +1,7 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX= v DISTVERSION= 1.2.196 +PORTREVISION= 1 CATEGORIES= graphics devel MAINTAINER= jbeich@FreeBSD.org diff --git a/graphics/vulkan-validation-layers/files/patch-headers-1.2.197 b/graphics/vulkan-validation-layers/files/patch-headers-1.2.197 new file mode 100644 index 000000000000..6f6af9d71f3e --- /dev/null +++ b/graphics/vulkan-validation-layers/files/patch-headers-1.2.197 @@ -0,0 +1,90 @@ +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.1A3M0Q9N061112>