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

hwcontext_vulkan: move ReBAR check into a new function and use it later

Browse Source 
The issue is that vulkan_device_create_internal() is only called for
devices that lavu creates by itself.
For external devices, this was never done.

This also solves some mid-function declaration warnings.
This commit is contained in:
Lynne
2025-06-24 02:11:59 +09:00
parent 5b1301004b
commit 85c0364b70
1 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
libavutil/hwcontext_vulkan.c
View File

@ -1663,6 +1663,29 @@ static void vulkan_device_uninit(AVHWDeviceContext *ctx)
ff_vk_uninit(&p->vkctx); ff_vk_uninit(&p->vkctx);
} }
static int vulkan_device_has_rebar(AVHWDeviceContext *ctx)
{
VulkanDevicePriv *p = ctx->hwctx;
AVVulkanDeviceContext *hwctx = &p->p;
FFVulkanFunctions *vk = &p->vkctx.vkfn;
VkPhysicalDeviceMemoryProperties mprops;
VkDeviceSize max_vram = 0, max_visible_vram = 0;
/* Get device memory properties */
vk->GetPhysicalDeviceMemoryProperties(hwctx->phys_dev, &mprops);
for (int i = 0; i < mprops.memoryTypeCount; i++) {
const VkMemoryType type = mprops.memoryTypes[i];
const VkMemoryHeap heap = mprops.memoryHeaps[type.heapIndex];
if (!(type.propertyFlags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT))
continue;
max_vram = FFMAX(max_vram, heap.size);
if (type.propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT)
max_visible_vram = FFMAX(max_visible_vram, heap.size);
}
return max_vram - max_visible_vram < 1024; /* 1 kB tolerance */
}
static int vulkan_device_create_internal(AVHWDeviceContext *ctx, static int vulkan_device_create_internal(AVHWDeviceContext *ctx,
VulkanDeviceSelection *dev_select, VulkanDeviceSelection *dev_select,
int disable_multiplane, int disable_multiplane,
@ -1697,23 +1720,6 @@ static int vulkan_device_create_internal(AVHWDeviceContext *ctx,
goto end; goto end;
} }
/* Get device memory properties */
vk->GetPhysicalDeviceMemoryProperties(hwctx->phys_dev, &p->mprops);
VkDeviceSize max_vram = 0, max_visible_vram = 0;
for (int i = 0; i < p->mprops.memoryTypeCount; i++) {
const VkMemoryType type = p->mprops.memoryTypes[i];
const VkMemoryHeap heap = p->mprops.memoryHeaps[type.heapIndex];
if (!(type.propertyFlags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT))
continue;
max_vram = FFMAX(max_vram, heap.size);
if (type.propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT)
max_visible_vram = FFMAX(max_visible_vram, heap.size);
}
/* Only use host image transfers if ReBAR is enabled */
const int has_rebar = max_vram - max_visible_vram < 1024; /* 1 kB tolerance */
p->disable_host_transfer = !has_rebar;
/* Get all supported features for the physical device */ /* Get all supported features for the physical device */
device_features_init(ctx, &supported_feats); device_features_init(ctx, &supported_feats);
vk->GetPhysicalDeviceFeatures2(hwctx->phys_dev, &supported_feats.device); vk->GetPhysicalDeviceFeatures2(hwctx->phys_dev, &supported_feats.device);
@ -2017,6 +2023,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
p->compute_qf = ff_vk_qf_find(&p->vkctx, VK_QUEUE_COMPUTE_BIT, 0); p->compute_qf = ff_vk_qf_find(&p->vkctx, VK_QUEUE_COMPUTE_BIT, 0);
p->transfer_qf = ff_vk_qf_find(&p->vkctx, VK_QUEUE_TRANSFER_BIT, 0); p->transfer_qf = ff_vk_qf_find(&p->vkctx, VK_QUEUE_TRANSFER_BIT, 0);
/* Only use host image transfers if ReBAR is enabled */
p->disable_host_transfer = !vulkan_device_has_rebar(ctx);
end: end:
av_free(qf_vid); av_free(qf_vid);
av_free(qf); av_free(qf);