This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 38990c59d73999dce2b1bb9ceae68431f9b3c474 Author: Andreas Rheinhardt <[email protected]> AuthorDate: Mon Mar 9 06:36:57 2026 +0100 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Tue Jun 23 19:15:57 2026 +0200 avutil/hwcontext_vulkan: Remove FF_API_VULKAN_FIXED_QUEUES Deprecated on 2024-08-11. Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavutil/hwcontext_vulkan.c | 101 ------------------------------------------- libavutil/hwcontext_vulkan.h | 52 ---------------------- libavutil/version.h | 1 - 3 files changed, 154 deletions(-) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 17380a22c0..20b6ed46f8 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -1741,35 +1741,6 @@ static int setup_queue_families(AVHWDeviceContext *ctx, VkDeviceCreateInfo *cd) }; } -#if FF_API_VULKAN_FIXED_QUEUES -FF_DISABLE_DEPRECATION_WARNINGS - /* Setup deprecated fields */ - hwctx->queue_family_index = -1; - hwctx->queue_family_comp_index = -1; - hwctx->queue_family_tx_index = -1; - hwctx->queue_family_encode_index = -1; - hwctx->queue_family_decode_index = -1; - -#define SET_OLD_QF(field, nb_field, type) \ - do { \ - if (field < 0 && hwctx->qf[i].flags & type) { \ - field = hwctx->qf[i].idx; \ - nb_field = hwctx->qf[i].num; \ - } \ - } while (0) - - for (uint32_t i = 0; i < hwctx->nb_qf; i++) { - SET_OLD_QF(hwctx->queue_family_index, hwctx->nb_graphics_queues, VK_QUEUE_GRAPHICS_BIT); - SET_OLD_QF(hwctx->queue_family_comp_index, hwctx->nb_comp_queues, VK_QUEUE_COMPUTE_BIT); - SET_OLD_QF(hwctx->queue_family_tx_index, hwctx->nb_tx_queues, VK_QUEUE_TRANSFER_BIT); - SET_OLD_QF(hwctx->queue_family_encode_index, hwctx->nb_encode_queues, VK_QUEUE_VIDEO_ENCODE_BIT_KHR); - SET_OLD_QF(hwctx->queue_family_decode_index, hwctx->nb_decode_queues, VK_QUEUE_VIDEO_DECODE_BIT_KHR); - } - -#undef SET_OLD_QF -FF_ENABLE_DEPRECATION_WARNINGS -#endif - return 0; } @@ -1947,7 +1918,6 @@ static int vulkan_device_init(AVHWDeviceContext *ctx) VkQueueFamilyProperties2 *qf; VkQueueFamilyVideoPropertiesKHR *qf_vid; VkPhysicalDeviceExternalSemaphoreInfo ext_sem_props_info; - int graph_index, comp_index, tx_index, enc_index, dec_index; /* Set device extension flags */ for (int i = 0; i < hwctx->nb_enabled_dev_extensions; i++) { @@ -2060,77 +2030,6 @@ static int vulkan_device_init(AVHWDeviceContext *ctx) } } -#if FF_API_VULKAN_FIXED_QUEUES -FF_DISABLE_DEPRECATION_WARNINGS - graph_index = hwctx->nb_graphics_queues ? hwctx->queue_family_index : -1; - comp_index = hwctx->nb_comp_queues ? hwctx->queue_family_comp_index : -1; - tx_index = hwctx->nb_tx_queues ? hwctx->queue_family_tx_index : -1; - dec_index = hwctx->nb_decode_queues ? hwctx->queue_family_decode_index : -1; - enc_index = hwctx->nb_encode_queues ? hwctx->queue_family_encode_index : -1; - -#define CHECK_QUEUE(type, required, fidx, ctx_qf, qc) \ - do { \ - if (ctx_qf < 0 && required) { \ - av_log(ctx, AV_LOG_ERROR, "%s queue family is required, but marked as missing" \ - " in the context!\n", type); \ - err = AVERROR(EINVAL); \ - goto end; \ - } else if (fidx < 0 || ctx_qf < 0) { \ - break; \ - } else if (ctx_qf >= qf_num) { \ - av_log(ctx, AV_LOG_ERROR, "Invalid %s family index %i (device has %i families)!\n", \ - type, ctx_qf, qf_num); \ - err = AVERROR(EINVAL); \ - goto end; \ - } \ - \ - av_log(ctx, AV_LOG_VERBOSE, "Using queue family %i (queues: %i)" \ - " for%s%s%s%s%s\n", \ - ctx_qf, qc, \ - ctx_qf == graph_index ? " graphics" : "", \ - ctx_qf == comp_index ? " compute" : "", \ - ctx_qf == tx_index ? " transfers" : "", \ - ctx_qf == enc_index ? " encode" : "", \ - ctx_qf == dec_index ? " decode" : ""); \ - graph_index = (ctx_qf == graph_index) ? -1 : graph_index; \ - comp_index = (ctx_qf == comp_index) ? -1 : comp_index; \ - tx_index = (ctx_qf == tx_index) ? -1 : tx_index; \ - enc_index = (ctx_qf == enc_index) ? -1 : enc_index; \ - dec_index = (ctx_qf == dec_index) ? -1 : dec_index; \ - } while (0) - - CHECK_QUEUE("graphics", 0, graph_index, hwctx->queue_family_index, hwctx->nb_graphics_queues); - CHECK_QUEUE("compute", 1, comp_index, hwctx->queue_family_comp_index, hwctx->nb_comp_queues); - CHECK_QUEUE("upload", 1, tx_index, hwctx->queue_family_tx_index, hwctx->nb_tx_queues); - CHECK_QUEUE("decode", 0, dec_index, hwctx->queue_family_decode_index, hwctx->nb_decode_queues); - CHECK_QUEUE("encode", 0, enc_index, hwctx->queue_family_encode_index, hwctx->nb_encode_queues); - -#undef CHECK_QUEUE - - /* Update the new queue family fields. If non-zero already, - * it means API users have set it. */ - if (!hwctx->nb_qf) { -#define ADD_QUEUE(ctx_qf, qc, flag) \ - do { \ - if (ctx_qf != -1) { \ - hwctx->qf[hwctx->nb_qf++] = (AVVulkanDeviceQueueFamily) { \ - .idx = ctx_qf, \ - .num = qc, \ - .flags = flag, \ - }; \ - } \ - } while (0) - - ADD_QUEUE(hwctx->queue_family_index, hwctx->nb_graphics_queues, VK_QUEUE_GRAPHICS_BIT); - ADD_QUEUE(hwctx->queue_family_comp_index, hwctx->nb_comp_queues, VK_QUEUE_COMPUTE_BIT); - ADD_QUEUE(hwctx->queue_family_tx_index, hwctx->nb_tx_queues, VK_QUEUE_TRANSFER_BIT); - ADD_QUEUE(hwctx->queue_family_decode_index, hwctx->nb_decode_queues, VK_QUEUE_VIDEO_DECODE_BIT_KHR); - ADD_QUEUE(hwctx->queue_family_encode_index, hwctx->nb_encode_queues, VK_QUEUE_VIDEO_ENCODE_BIT_KHR); -#undef ADD_QUEUE - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif - for (int i = 0; i < hwctx->nb_qf; i++) { if (!hwctx->qf[i].video_caps && hwctx->qf[i].flags & (VK_QUEUE_VIDEO_DECODE_BIT_KHR | diff --git a/libavutil/hwcontext_vulkan.h b/libavutil/hwcontext_vulkan.h index 2bd6d50198..8944d54344 100644 --- a/libavutil/hwcontext_vulkan.h +++ b/libavutil/hwcontext_vulkan.h @@ -116,58 +116,6 @@ typedef struct AVVulkanDeviceContext { const char * const *enabled_dev_extensions; int nb_enabled_dev_extensions; -#if FF_API_VULKAN_FIXED_QUEUES - /** - * Queue family index for graphics operations, and the number of queues - * enabled for it. If unavailable, will be set to -1. Not required. - * av_hwdevice_create() will attempt to find a dedicated queue for each - * queue family, or pick the one with the least unrelated flags set. - * Queue indices here may overlap if a queue has to share capabilities. - */ - attribute_deprecated - int queue_family_index; - attribute_deprecated - int nb_graphics_queues; - - /** - * Queue family index for transfer operations and the number of queues - * enabled. Required. - */ - attribute_deprecated - int queue_family_tx_index; - attribute_deprecated - int nb_tx_queues; - - /** - * Queue family index for compute operations and the number of queues - * enabled. Required. - */ - attribute_deprecated - int queue_family_comp_index; - attribute_deprecated - int nb_comp_queues; - - /** - * Queue family index for video encode ops, and the amount of queues enabled. - * If the device doesn't support such, queue_family_encode_index will be -1. - * Not required. - */ - attribute_deprecated - int queue_family_encode_index; - attribute_deprecated - int nb_encode_queues; - - /** - * Queue family index for video decode ops, and the amount of queues enabled. - * If the device doesn't support such, queue_family_decode_index will be -1. - * Not required. - */ - attribute_deprecated - int queue_family_decode_index; - attribute_deprecated - int nb_decode_queues; -#endif - #if FF_API_VULKAN_SYNC_QUEUES /** * Locks a queue, preventing other threads from submitting any command diff --git a/libavutil/version.h b/libavutil/version.h index 1956eeabba..331fbc32b3 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,7 +105,6 @@ * @{ */ -#define FF_API_VULKAN_FIXED_QUEUES (LIBAVUTIL_VERSION_MAJOR < 61) #define FF_API_OPT_INT_LIST (LIBAVUTIL_VERSION_MAJOR < 61) #define FF_API_OPT_PTR (LIBAVUTIL_VERSION_MAJOR < 61) #define FF_API_CPU_FLAG_FORCE (LIBAVUTIL_VERSION_MAJOR < 61) _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
