virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

hwcontext_vulkan: remove unused internal REQUIRED extension flag

Browse Source 
This is a leftover from an old version which used the 1.0 Vulkan API
with the maintenance extensions being required.
This commit is contained in:
Lynne 2020-05-10 15:17:27 +01:00
parent dccd07f66d
commit 030a565baf
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavutil/hwcontext_vulkan.c
View File

@ -181,8 +181,7 @@ enum VulkanExtensions {
EXT_EXTERNAL_FD_MEMORY = 1ULL << 2, /* VK_KHR_external_memory_fd */
EXT_EXTERNAL_FD_SEM = 1ULL << 3, /* VK_KHR_external_semaphore_fd */
EXT_OPTIONAL = 1ULL << 62,
EXT_REQUIRED = 1ULL << 63,
EXT_NO_FLAG = 1ULL << 63,
};
typedef struct VulkanOptExtension {
@ -191,7 +190,7 @@ typedef struct VulkanOptExtension {
} VulkanOptExtension;
static const VulkanOptExtension optional_instance_exts[] = {
{ VK_KHR_SURFACE_EXTENSION_NAME, EXT_OPTIONAL },
{ VK_KHR_SURFACE_EXTENSION_NAME, EXT_NO_FLAG },
};
static const VulkanOptExtension optional_device_exts[] = {
@ -321,9 +320,7 @@ static int check_extensions(AVHWDeviceContext *ctx, int dev, AVDictionary *opts,
}
for (int i = 0; i < optional_exts_num; i++) {
int req = optional_exts[i].flag & EXT_REQUIRED;
tstr = optional_exts[i].name;
found = 0;
for (int j = 0; j < sup_ext_count; j++) {
if (!strcmp(tstr, sup_ext[j].extensionName)) {
@ -331,20 +328,11 @@ static int check_extensions(AVHWDeviceContext *ctx, int dev, AVDictionary *opts,
break;
}
}
if (!found) {
int lvl = req ? AV_LOG_ERROR : AV_LOG_VERBOSE;
av_log(ctx, lvl, "Extension \"%s\" not found!\n", tstr);
if (req) {
err = AVERROR(EINVAL);
goto end;
}
if (!found)
continue;
}
if (!req)
p->extensions |= optional_exts[i].flag;
av_log(ctx, AV_LOG_VERBOSE, "Using %s extension \"%s\"\n", mod, tstr);
p->extensions |= optional_exts[i].flag;
ADD_VAL_TO_LIST(extension_names, extensions_found, tstr);
}