From 7f3878828d88c6a8287d54818659e6f70293dabb Mon Sep 17 00:00:00 2001 From: Lynne Date: Mon, 11 Oct 2021 00:20:15 +0200 Subject: [PATCH] hwcontext_vulkan: bump required Vulkan loader version to 1.2 --- configure | 6 +++--- libavutil/hwcontext_vulkan.c | 2 +- libavutil/hwcontext_vulkan.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index c01aa480c7..103829e688 100755 --- a/configure +++ b/configure @@ -6824,10 +6824,10 @@ enabled vdpau && enabled crystalhd && check_lib crystalhd "stdint.h libcrystalhd/libcrystalhd_if.h" DtsCrystalHDVersion -lcrystalhd if enabled vulkan; then - require_pkg_config_cpp vulkan "vulkan >= 1.1.97" "vulkan/vulkan.h" "defined VK_VERSION_1_1" || - require_cpp_condition vulkan "vulkan/vulkan.h" "defined VK_VERSION_1_1" + require_pkg_config_cpp vulkan "vulkan >= 1.2.189" "vulkan/vulkan.h" "defined VK_VERSION_1_2" || + require_cpp_condition vulkan "vulkan/vulkan.h" "defined VK_VERSION_1_2" # vulkan_lib should be removed once glslang filters are updated - check_pkg_config vulkan_lib "vulkan >= 1.1.97" "vulkan/vulkan.h" vkCreateInstance + check_pkg_config vulkan_lib "vulkan >= 1.2.189" "vulkan/vulkan.h" vkCreateInstance fi if enabled x86; then diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 2c3216857a..570ebf23bb 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -676,7 +676,7 @@ static int create_instance(AVHWDeviceContext *ctx, AVDictionary *opts) VkApplicationInfo application_info = { .sType = VK_STRUCTURE_TYPE_APPLICATION_INFO, .pEngineName = "libavutil", - .apiVersion = VK_API_VERSION_1_1, + .apiVersion = VK_API_VERSION_1_2, .engineVersion = VK_MAKE_VERSION(LIBAVUTIL_VERSION_MAJOR, LIBAVUTIL_VERSION_MINOR, LIBAVUTIL_VERSION_MICRO), diff --git a/libavutil/hwcontext_vulkan.h b/libavutil/hwcontext_vulkan.h index e4645527d7..8d1ae50e65 100644 --- a/libavutil/hwcontext_vulkan.h +++ b/libavutil/hwcontext_vulkan.h @@ -50,7 +50,7 @@ typedef struct AVVulkanDeviceContext { PFN_vkGetInstanceProcAddr get_proc_addr; /** - * Vulkan instance. Must be at least version 1.1. + * Vulkan instance. Must be at least version 1.2. */ VkInstance inst;