virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

vulkan: maintain compatibility with old headers

Browse Source 
Previous patch to fix these issues was incomplete.
This commit is contained in:
Lynne
2025-06-17 13:18:23 +09:00
parent d71c863132
commit e5bb448543
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libavutil/hwcontext_vulkan.c
View File

@ -4170,7 +4170,7 @@ static int vulkan_transfer_host(AVHWFramesContext *hwfc, AVFrame *hwf,
const int nb_images = ff_vk_count_images(hwf_vk); const int nb_images = ff_vk_count_images(hwf_vk);
VkSemaphoreWaitInfo sem_wait; VkSemaphoreWaitInfo sem_wait;
VkHostImageLayoutTransitionInfo layout_ch_info[AV_NUM_DATA_POINTERS]; VkHostImageLayoutTransitionInfoEXT layout_ch_info[AV_NUM_DATA_POINTERS];
int nb_layout_ch = 0; int nb_layout_ch = 0;
hwfc_vk->lock_frame(hwfc, hwf_vk); hwfc_vk->lock_frame(hwfc, hwf_vk);
@ -4186,8 +4186,8 @@ static int vulkan_transfer_host(AVHWFramesContext *hwfc, AVFrame *hwf,
if (compat) if (compat)
continue; continue;
layout_ch_info[nb_layout_ch] = (VkHostImageLayoutTransitionInfo) { layout_ch_info[nb_layout_ch] = (VkHostImageLayoutTransitionInfoEXT) {
.sType = VK_STRUCTURE_TYPE_HOST_IMAGE_LAYOUT_TRANSITION_INFO, .sType = VK_STRUCTURE_TYPE_HOST_IMAGE_LAYOUT_TRANSITION_INFO_EXT,
.image = hwf_vk->img[i], .image = hwf_vk->img[i],
.oldLayout = hwf_vk->layout[i], .oldLayout = hwf_vk->layout[i],
.newLayout = VK_IMAGE_LAYOUT_GENERAL, .newLayout = VK_IMAGE_LAYOUT_GENERAL,
@ -4216,15 +4216,15 @@ static int vulkan_transfer_host(AVHWFramesContext *hwfc, AVFrame *hwf,
nb_layout_ch, layout_ch_info); nb_layout_ch, layout_ch_info);
if (upload) { if (upload) {
VkMemoryToImageCopy region_info = { VkMemoryToImageCopyEXT region_info = {
.sType = VK_STRUCTURE_TYPE_MEMORY_TO_IMAGE_COPY, .sType = VK_STRUCTURE_TYPE_MEMORY_TO_IMAGE_COPY_EXT,
.imageSubresource = { .imageSubresource = {
.layerCount = 1, .layerCount = 1,
}, },
}; };
VkCopyMemoryToImageInfo copy_info = { VkCopyMemoryToImageInfoEXT copy_info = {
.sType = VK_STRUCTURE_TYPE_COPY_MEMORY_TO_IMAGE_INFO, .sType = VK_STRUCTURE_TYPE_COPY_MEMORY_TO_IMAGE_INFO_EXT,
.flags = VK_HOST_IMAGE_COPY_MEMCPY, .flags = VK_HOST_IMAGE_COPY_MEMCPY_EXT,
.regionCount = 1, .regionCount = 1,
.pRegions = &region_info, .pRegions = &region_info,
}; };
@ -4242,15 +4242,15 @@ static int vulkan_transfer_host(AVHWFramesContext *hwfc, AVFrame *hwf,
vk->CopyMemoryToImageEXT(hwctx->act_dev, &copy_info); vk->CopyMemoryToImageEXT(hwctx->act_dev, &copy_info);
} }
} else { } else {
VkImageToMemoryCopy region_info = { VkImageToMemoryCopyEXT region_info = {
.sType = VK_STRUCTURE_TYPE_MEMORY_TO_IMAGE_COPY, .sType = VK_STRUCTURE_TYPE_MEMORY_TO_IMAGE_COPY_EXT,
.imageSubresource = { .imageSubresource = {
.layerCount = 1, .layerCount = 1,
}, },
}; };
VkCopyImageToMemoryInfo copy_info = { VkCopyImageToMemoryInfoEXT copy_info = {
.sType = VK_STRUCTURE_TYPE_COPY_IMAGE_TO_MEMORY_INFO, .sType = VK_STRUCTURE_TYPE_COPY_IMAGE_TO_MEMORY_INFO_EXT,
.flags = VK_HOST_IMAGE_COPY_MEMCPY, .flags = VK_HOST_IMAGE_COPY_MEMCPY_EXT,
.regionCount = 1, .regionCount = 1,
.pRegions = &region_info, .pRegions = &region_info,
}; };

2
libavutil/vulkan.c
View File

@ -165,7 +165,7 @@ int ff_vk_load_props(FFVulkanContext *s)
FF_VK_STRUCT_EXT(s, &s->props, &s->optical_flow_props, FF_VK_EXT_OPTICAL_FLOW, FF_VK_STRUCT_EXT(s, &s->props, &s->optical_flow_props, FF_VK_EXT_OPTICAL_FLOW,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_OPTICAL_FLOW_PROPERTIES_NV); VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_OPTICAL_FLOW_PROPERTIES_NV);
FF_VK_STRUCT_EXT(s, &s->props, &s->host_image_props, FF_VK_EXT_HOST_IMAGE_COPY, FF_VK_STRUCT_EXT(s, &s->props, &s->host_image_props, FF_VK_EXT_HOST_IMAGE_COPY,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_PROPERTIES); VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_PROPERTIES_EXT);
s->feats = (VkPhysicalDeviceFeatures2) { s->feats = (VkPhysicalDeviceFeatures2) {
.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2, .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2,