Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

hwcontext_vulkan: properly support STORAGE usage for mutliplane images

Browse source 
Fixes multiplane support on Nvidia.

Also, remove the ENCODE usage, even if the driver signals it as supported.
Currently, it's not used, and when it is used, it'll be gated behind
two extension checks.
This commit is contained in:
Lynne 2023-10-05 20:25:33 +02:00
parent 2a36e44af3
commit 81cc0e1345
Signed by: Lynne
GPG key ID: A2FEA5F03F034464
2 changed files with 39 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libavfilter/vulkan_filter.c
View file

@ -42,18 +42,23 @@ int ff_vk_filter_init_context(AVFilterContext *avctx, FFVulkanContext *s,
vk_frames = frames_ctx->hwctx; vk_frames = frames_ctx->hwctx;
vk_dev = device_ctx->hwctx; vk_dev = device_ctx->hwctx;
/* Basic format validation */ /* Width and height mismatch */
if (width != frames_ctx->width || if (width != frames_ctx->width ||
height != frames_ctx->height || height != frames_ctx->height)
sw_format != frames_ctx->sw_format ||
(vk_frames->tiling != VK_IMAGE_TILING_LINEAR &&
vk_frames->tiling != VK_IMAGE_TILING_OPTIMAL) ||
!(vk_frames->usage & VK_IMAGE_USAGE_SAMPLED_BIT)) {
goto skip; goto skip;
}
if (vk_frames->usage & VK_IMAGE_USAGE_STORAGE_BIT) /* Format mismatch */
goto accept; if (sw_format != frames_ctx->sw_format)
goto skip;
/* Unusual tiling mismatch. Don't let linear through either. */
if (vk_frames->tiling != VK_IMAGE_TILING_OPTIMAL)
goto skip;
/* Usage mismatch */
if ((vk_frames->usage & (VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_STORAGE_BIT)) !=
(VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_STORAGE_BIT))
goto skip;
s->extensions = ff_vk_extensions_to_mask(vk_dev->enabled_dev_extensions, s->extensions = ff_vk_extensions_to_mask(vk_dev->enabled_dev_extensions,
vk_dev->nb_enabled_dev_extensions); vk_dev->nb_enabled_dev_extensions);
@ -110,6 +115,7 @@ accept:
vk_frames = frames_ctx->hwctx; vk_frames = frames_ctx->hwctx;
vk_frames->tiling = VK_IMAGE_TILING_OPTIMAL; vk_frames->tiling = VK_IMAGE_TILING_OPTIMAL;
vk_frames->usage = VK_IMAGE_USAGE_SAMPLED_BIT | vk_frames->usage = VK_IMAGE_USAGE_SAMPLED_BIT |
VK_IMAGE_USAGE_STORAGE_BIT |
VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT |
VK_IMAGE_USAGE_TRANSFER_DST_BIT; VK_IMAGE_USAGE_TRANSFER_DST_BIT;

36
libavutil/hwcontext_vulkan.c
View file

@ -282,9 +282,11 @@ FN_MAP_TO(VkImageUsageFlags, usage, VkFormatFeatureFlagBits2, feats)
static int vkfmt_from_pixfmt2(AVHWDeviceContext *dev_ctx, enum AVPixelFormat p, static int vkfmt_from_pixfmt2(AVHWDeviceContext *dev_ctx, enum AVPixelFormat p,
VkImageTiling tiling, VkImageTiling tiling,
VkFormat fmts[AV_NUM_DATA_POINTERS], VkFormat fmts[AV_NUM_DATA_POINTERS], /* Output format list */
int *nb_images, VkImageAspectFlags *aspect, int *nb_images, /* Output number of images */
VkImageUsageFlags *supported_usage, int disable_multiplane) VkImageAspectFlags *aspect, /* Output aspect */
VkImageUsageFlags *supported_usage, /* Output supported usage */
int disable_multiplane, int need_storage)
{ {
AVVulkanDeviceContext *hwctx = dev_ctx->hwctx; AVVulkanDeviceContext *hwctx = dev_ctx->hwctx;
VulkanDevicePriv *priv = dev_ctx->internal->priv; VulkanDevicePriv *priv = dev_ctx->internal->priv;
@ -301,6 +303,7 @@ static int vkfmt_from_pixfmt2(AVHWDeviceContext *dev_ctx, enum AVPixelFormat p,
}; };
VkFormatFeatureFlagBits2 feats_primary, feats_secondary; VkFormatFeatureFlagBits2 feats_primary, feats_secondary;
int basics_primary = 0, basics_secondary = 0; int basics_primary = 0, basics_secondary = 0;
int storage_primary = 0, storage_secondary = 0;
vk->GetPhysicalDeviceFormatProperties2(hwctx->phys_dev, vk->GetPhysicalDeviceFormatProperties2(hwctx->phys_dev,
vk_formats_list[i].vkf, vk_formats_list[i].vkf,
@ -310,6 +313,7 @@ static int vkfmt_from_pixfmt2(AVHWDeviceContext *dev_ctx, enum AVPixelFormat p,
prop.formatProperties.linearTilingFeatures : prop.formatProperties.linearTilingFeatures :
prop.formatProperties.optimalTilingFeatures; prop.formatProperties.optimalTilingFeatures;
basics_primary = (feats_primary & basic_flags) == basic_flags; basics_primary = (feats_primary & basic_flags) == basic_flags;
storage_primary = !!(feats_primary & VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT);
if (vk_formats_list[i].vkf != vk_formats_list[i].fallback[0]) { if (vk_formats_list[i].vkf != vk_formats_list[i].fallback[0]) {
vk->GetPhysicalDeviceFormatProperties2(hwctx->phys_dev, vk->GetPhysicalDeviceFormatProperties2(hwctx->phys_dev,
@ -319,11 +323,15 @@ static int vkfmt_from_pixfmt2(AVHWDeviceContext *dev_ctx, enum AVPixelFormat p,
prop.formatProperties.linearTilingFeatures : prop.formatProperties.linearTilingFeatures :
prop.formatProperties.optimalTilingFeatures; prop.formatProperties.optimalTilingFeatures;
basics_secondary = (feats_secondary & basic_flags) == basic_flags; basics_secondary = (feats_secondary & basic_flags) == basic_flags;
storage_secondary = !!(feats_secondary & VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT);
} else { } else {
basics_secondary = basics_primary; basics_secondary = basics_primary;
storage_secondary = storage_primary;
} }
if (basics_primary && !(disable_multiplane && vk_formats_list[i].vk_planes > 1)) { if (basics_primary &&
!(disable_multiplane && vk_formats_list[i].vk_planes > 1) &&
(!need_storage || (need_storage && (storage_primary | storage_secondary)))) {
if (fmts) if (fmts)
fmts[0] = vk_formats_list[i].vkf; fmts[0] = vk_formats_list[i].vkf;
if (nb_images) if (nb_images)
@ -331,9 +339,12 @@ static int vkfmt_from_pixfmt2(AVHWDeviceContext *dev_ctx, enum AVPixelFormat p,
if (aspect) if (aspect)
*aspect = vk_formats_list[i].aspect; *aspect = vk_formats_list[i].aspect;
if (supported_usage) if (supported_usage)
*supported_usage = map_feats_to_usage(feats_primary); *supported_usage = map_feats_to_usage(feats_primary) |
((need_storage && (storage_primary | storage_secondary)) ?
VK_IMAGE_USAGE_STORAGE_BIT : 0);
return 0; return 0;
} else if (basics_secondary) { } else if (basics_secondary &&
(!need_storage || (need_storage && storage_secondary))) {
if (fmts) { if (fmts) {
for (int j = 0; j < vk_formats_list[i].nb_images_fallback; j++) for (int j = 0; j < vk_formats_list[i].nb_images_fallback; j++)
fmts[j] = vk_formats_list[i].fallback[j]; fmts[j] = vk_formats_list[i].fallback[j];
@ -1640,7 +1651,7 @@ static int vulkan_frames_get_constraints(AVHWDeviceContext *ctx,
count += vkfmt_from_pixfmt2(ctx, vk_formats_list[i].pixfmt, count += vkfmt_from_pixfmt2(ctx, vk_formats_list[i].pixfmt,
p->use_linear_images ? VK_IMAGE_TILING_LINEAR : p->use_linear_images ? VK_IMAGE_TILING_LINEAR :
VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_TILING_OPTIMAL,
NULL, NULL, NULL, NULL, 0) >= 0; NULL, NULL, NULL, NULL, 0, 0) >= 0;
} }
#if CONFIG_CUDA #if CONFIG_CUDA
@ -1658,7 +1669,7 @@ static int vulkan_frames_get_constraints(AVHWDeviceContext *ctx,
if (vkfmt_from_pixfmt2(ctx, vk_formats_list[i].pixfmt, if (vkfmt_from_pixfmt2(ctx, vk_formats_list[i].pixfmt,
p->use_linear_images ? VK_IMAGE_TILING_LINEAR : p->use_linear_images ? VK_IMAGE_TILING_LINEAR :
VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_TILING_OPTIMAL,
NULL, NULL, NULL, NULL, 0) >= 0) { NULL, NULL, NULL, NULL, 0, 0) >= 0) {
constraints->valid_sw_formats[count++] = vk_formats_list[i].pixfmt; constraints->valid_sw_formats[count++] = vk_formats_list[i].pixfmt;
} }
} }
@ -2294,7 +2305,8 @@ static int vulkan_frames_init(AVHWFramesContext *hwfc)
/* Check if the sw_format itself is supported */ /* Check if the sw_format itself is supported */
err = vkfmt_from_pixfmt2(hwfc->device_ctx, hwfc->sw_format, err = vkfmt_from_pixfmt2(hwfc->device_ctx, hwfc->sw_format,
hwctx->tiling, NULL, hwctx->tiling, NULL,
NULL, NULL, &supported_usage, 0); NULL, NULL, &supported_usage, 0,
hwctx->usage & VK_IMAGE_USAGE_STORAGE_BIT);
if (err < 0) { if (err < 0) {
av_log(hwfc, AV_LOG_ERROR, "Unsupported sw format: %s!\n", av_log(hwfc, AV_LOG_ERROR, "Unsupported sw format: %s!\n",
av_get_pix_fmt_name(hwfc->sw_format)); av_get_pix_fmt_name(hwfc->sw_format));
@ -2304,7 +2316,8 @@ static int vulkan_frames_init(AVHWFramesContext *hwfc)
err = vkfmt_from_pixfmt2(hwfc->device_ctx, hwfc->sw_format, err = vkfmt_from_pixfmt2(hwfc->device_ctx, hwfc->sw_format,
hwctx->tiling, hwctx->format, NULL, hwctx->tiling, hwctx->format, NULL,
NULL, &supported_usage, NULL, &supported_usage,
disable_multiplane); disable_multiplane,
hwctx->usage & VK_IMAGE_USAGE_STORAGE_BIT);
if (err < 0) if (err < 0)
return err; return err;
} }
@ -2314,8 +2327,7 @@ static int vulkan_frames_init(AVHWFramesContext *hwfc)
hwctx->usage = supported_usage & (VK_BUFFER_USAGE_TRANSFER_DST_BIT | hwctx->usage = supported_usage & (VK_BUFFER_USAGE_TRANSFER_DST_BIT |
VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_SRC_BIT |
VK_IMAGE_USAGE_STORAGE_BIT | VK_IMAGE_USAGE_STORAGE_BIT |
VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_SAMPLED_BIT);
VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR);
} }
/* Image creation flags. /* Image creation flags.