hwcontext_vulkan: bump required Vulkan loader version to 1.2

pull/374/head
Lynne 3 years ago
parent 047c362d3c
commit 7f3878828d
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
  1. 6
      configure
  2. 2
      libavutil/hwcontext_vulkan.c
  3. 2
      libavutil/hwcontext_vulkan.h

6
configure vendored

@ -6824,10 +6824,10 @@ enabled vdpau &&
enabled crystalhd && check_lib crystalhd "stdint.h libcrystalhd/libcrystalhd_if.h" DtsCrystalHDVersion -lcrystalhd enabled crystalhd && check_lib crystalhd "stdint.h libcrystalhd/libcrystalhd_if.h" DtsCrystalHDVersion -lcrystalhd
if enabled vulkan; then if enabled vulkan; then
require_pkg_config_cpp vulkan "vulkan >= 1.1.97" "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_1" require_cpp_condition vulkan "vulkan/vulkan.h" "defined VK_VERSION_1_2"
# vulkan_lib should be removed once glslang filters are updated # 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 fi
if enabled x86; then if enabled x86; then

@ -676,7 +676,7 @@ static int create_instance(AVHWDeviceContext *ctx, AVDictionary *opts)
VkApplicationInfo application_info = { VkApplicationInfo application_info = {
.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO, .sType = VK_STRUCTURE_TYPE_APPLICATION_INFO,
.pEngineName = "libavutil", .pEngineName = "libavutil",
.apiVersion = VK_API_VERSION_1_1, .apiVersion = VK_API_VERSION_1_2,
.engineVersion = VK_MAKE_VERSION(LIBAVUTIL_VERSION_MAJOR, .engineVersion = VK_MAKE_VERSION(LIBAVUTIL_VERSION_MAJOR,
LIBAVUTIL_VERSION_MINOR, LIBAVUTIL_VERSION_MINOR,
LIBAVUTIL_VERSION_MICRO), LIBAVUTIL_VERSION_MICRO),

@ -50,7 +50,7 @@ typedef struct AVVulkanDeviceContext {
PFN_vkGetInstanceProcAddr get_proc_addr; 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; VkInstance inst;

Loading…
Cancel
Save