[FFmpeg-devel] [PATCH] hwcontext_vulkan: check if expect_assume is supported by the headers

[James Almer]

On 4/15/2025 4:31 PM, Lynne wrote:
> ---
>   libavutil/hwcontext_vulkan.c | 8 ++++++++
>   libavutil/vulkan_loader.h    | 2 ++
>   2 files changed, 10 insertions(+)
> 
> diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
> index 8823af0175..f878dfec76 100644
> --- a/libavutil/hwcontext_vulkan.c
> +++ b/libavutil/hwcontext_vulkan.c
> @@ -79,7 +79,9 @@ typedef struct VulkanDeviceFeatures {
>       VkPhysicalDeviceVulkan12Features vulkan_1_2;
>       VkPhysicalDeviceVulkan13Features vulkan_1_3;
>       VkPhysicalDeviceTimelineSemaphoreFeatures timeline_semaphore;
> +#ifdef VK_KHR_expect_assume

Are you sure it's not VK_KHR_shader_expect_assume as mentioned in 
https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderExpectAssumeFeatures.html 
?

>       VkPhysicalDeviceShaderExpectAssumeFeatures expect_assume;
> +#endif
>   
>       VkPhysicalDeviceVideoMaintenance1FeaturesKHR video_maintenance_1;
>   #ifdef VK_KHR_video_maintenance2
> @@ -211,8 +213,10 @@ static void device_features_init(AVHWDeviceContext *ctx, VulkanDeviceFeatures *f
>       OPT_CHAIN(&feats->timeline_semaphore, FF_VK_EXT_PORTABILITY_SUBSET,
>                 VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES);
>   
> +#ifdef VK_KHR_expect_assume
>       OPT_CHAIN(&feats->expect_assume, FF_VK_EXT_EXPECT_ASSUME,
>                 VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_EXPECT_ASSUME_FEATURES_KHR);
> +#endif
>   
>       OPT_CHAIN(&feats->video_maintenance_1, FF_VK_EXT_VIDEO_MAINTENANCE_1,
>                 VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_MAINTENANCE_1_FEATURES_KHR);
> @@ -306,7 +310,9 @@ static void device_features_copy_needed(VulkanDeviceFeatures *dst, VulkanDeviceF
>       COPY_VAL(relaxed_extended_instruction.shaderRelaxedExtendedInstruction);
>   #endif
>   
> +#ifdef VK_KHR_expect_assume
>       COPY_VAL(expect_assume.shaderExpectAssume);
> +#endif
>   
>       COPY_VAL(optical_flow.opticalFlow);
>   #undef COPY_VAL
> @@ -622,7 +628,9 @@ static const VulkanOptExtension optional_device_exts[] = {
>       { VK_KHR_COOPERATIVE_MATRIX_EXTENSION_NAME,               FF_VK_EXT_COOP_MATRIX            },
>       { VK_NV_OPTICAL_FLOW_EXTENSION_NAME,                      FF_VK_EXT_OPTICAL_FLOW           },
>       { VK_EXT_SHADER_OBJECT_EXTENSION_NAME,                    FF_VK_EXT_SHADER_OBJECT          },
> +#ifdef VK_KHR_expect_assume
>       { VK_KHR_SHADER_EXPECT_ASSUME_EXTENSION_NAME,             FF_VK_EXT_EXPECT_ASSUME          },
> +#endif
>       { VK_KHR_VIDEO_MAINTENANCE_1_EXTENSION_NAME,              FF_VK_EXT_VIDEO_MAINTENANCE_1    },
>   #ifdef VK_KHR_video_maintenance2
>       { VK_KHR_VIDEO_MAINTENANCE_2_EXTENSION_NAME,              FF_VK_EXT_VIDEO_MAINTENANCE_2    },
> diff --git a/libavutil/vulkan_loader.h b/libavutil/vulkan_loader.h
> index 3641fcb22e..46172403ba 100644
> --- a/libavutil/vulkan_loader.h
> +++ b/libavutil/vulkan_loader.h
> @@ -76,7 +76,9 @@ static inline uint64_t ff_vk_extensions_to_mask(const char * const *extensions,
>           { VK_KHR_VIDEO_DECODE_H265_EXTENSION_NAME,         FF_VK_EXT_VIDEO_DECODE_H265      },
>           { VK_KHR_VIDEO_DECODE_AV1_EXTENSION_NAME,          FF_VK_EXT_VIDEO_DECODE_AV1       },
>           { VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME,           FF_VK_EXT_PUSH_DESCRIPTOR        },
> +#ifdef VK_KHR_expect_assume
>           { VK_KHR_SHADER_EXPECT_ASSUME_EXTENSION_NAME,      FF_VK_EXT_EXPECT_ASSUME          },
> +#endif
>       };
>   
>       FFVulkanExtensions mask = 0x0;

-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature.asc
Type: application/pgp-signature
Size: 495 bytes
Desc: OpenPGP digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20250415/b0cb50aa/attachment.sig>