github-mirrors/FFmpeg
1
0
Fork 0
mirror of https://mirror.skon.top/https://github.com/FFmpeg/FFmpeg synced 2026-04-20 21:00:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

hwcontext_vulkan: zero-pad optional_instance_exts

Browse Source 
The layer settings extension was enabled since the list was blank,
and some compilers complained about that, and it should have been
always supported on all platforms everywhere.

Unfortunately, some platforms LIE, claim they support it and yet
they error out that the extension is missing.

Juse zero pad the array.
This commit is contained in:
Lynne
2026-02-08 05:56:51 +01:00
parent ee1d5da27f
commit 6f749ec0a7
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavutil/hwcontext_vulkan.c
View File

@@ -677,10 +677,10 @@ typedef struct VulkanOptExtension {
} VulkanOptExtension;
static const VulkanOptExtension optional_instance_exts[] = {
{ VK_EXT_LAYER_SETTINGS_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
#ifdef __APPLE__
{ VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
#endif
{ 0 },
};
static const VulkanOptExtension optional_device_exts[] = {
@@ -746,14 +746,14 @@ static const VulkanOptExtension optional_device_exts[] = {
const char **av_vk_get_optional_instance_extensions(int *count)
{
const char **exts = av_malloc_array(sizeof(*exts),
FF_ARRAY_ELEMS(optional_instance_exts));
FF_ARRAY_ELEMS(optional_instance_exts) - 1);
if (!exts)
return NULL;
for (int i = 0; i < FF_ARRAY_ELEMS(optional_instance_exts); i++)
for (int i = 0; i < FF_ARRAY_ELEMS(optional_instance_exts) - 1; i++)
exts[i] = optional_instance_exts[i].name;
*count = FF_ARRAY_ELEMS(optional_instance_exts);
*count = FF_ARRAY_ELEMS(optional_instance_exts) - 1;
return exts;
}
@@ -881,7 +881,7 @@ static int check_extensions(AVHWDeviceContext *ctx, int dev, AVDictionary *opts,
if (!dev) {
mod = "instance";
optional_exts = optional_instance_exts;
optional_exts_num = FF_ARRAY_ELEMS(optional_instance_exts);
optional_exts_num = FF_ARRAY_ELEMS(optional_instance_exts) - 1;
user_exts = av_dict_get(opts, "instance_extensions", NULL, 0);
if (user_exts) {
user_exts_str = av_strdup(user_exts->value);