virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

hwcontext_vulkan: fix VUID-VkPhysicalDeviceImageFormatInfo2-usage-requiredbitmask

Browse Source 
fmt_props.usage was initialized to 0 as create_info.usage was set later.
This commit is contained in:
Lynne 2024-09-20 05:08:16 +02:00
parent 2bf588f273
commit 1445102e68
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavutil/hwcontext_vulkan.c
View File

@ -2929,7 +2929,16 @@ static int vulkan_map_from_drm_frame_desc(AVHWFramesContext *hwfc, AVVkFrame **f
.pNext = &props_drm_mod, .pNext = &props_drm_mod,
.handleType = ext_img_spec.handleTypes, .handleType = ext_img_spec.handleTypes,
}; };
VkPhysicalDeviceImageFormatInfo2 fmt_props = { VkPhysicalDeviceImageFormatInfo2 fmt_props;
if (flags & AV_HWFRAME_MAP_READ)
create_info.usage |= VK_IMAGE_USAGE_SAMPLED_BIT |
VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
if (flags & AV_HWFRAME_MAP_WRITE)
create_info.usage |= VK_IMAGE_USAGE_STORAGE_BIT |
VK_IMAGE_USAGE_TRANSFER_DST_BIT;
fmt_props = (VkPhysicalDeviceImageFormatInfo2) {
.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2, .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2,
.pNext = &props_ext, .pNext = &props_ext,
.format = create_info.format, .format = create_info.format,
@ -2939,13 +2948,6 @@ static int vulkan_map_from_drm_frame_desc(AVHWFramesContext *hwfc, AVVkFrame **f
.flags = create_info.flags, .flags = create_info.flags,
}; };
if (flags & AV_HWFRAME_MAP_READ)
create_info.usage |= VK_IMAGE_USAGE_SAMPLED_BIT |
VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
if (flags & AV_HWFRAME_MAP_WRITE)
create_info.usage |= VK_IMAGE_USAGE_STORAGE_BIT |
VK_IMAGE_USAGE_TRANSFER_DST_BIT;
/* Check if importing is possible for this combination of parameters */ /* Check if importing is possible for this combination of parameters */
ret = vk->GetPhysicalDeviceImageFormatProperties2(hwctx->phys_dev, ret = vk->GetPhysicalDeviceImageFormatProperties2(hwctx->phys_dev,
&fmt_props, &props_ret); &fmt_props, &props_ret);