From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 81A1E4B58A for ; Tue, 9 Jul 2024 01:07:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F335668DCA4; Tue, 9 Jul 2024 04:07:43 +0300 (EEST) Received: from vidala.lynne.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7DF4768DC9D for ; Tue, 9 Jul 2024 04:07:37 +0300 (EEST) To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Jul 2024 03:07:13 +0200 Message-ID: <20240709010719.914497-2-dev@lynne.ee> X-Mailer: git-send-email 2.45.1.288.g0e0cd299f1 In-Reply-To: <20240709010719.914497-1-dev@lynne.ee> References: <20240709010719.914497-1-dev@lynne.ee> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] vulkan: use the new queue family mechanism X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Lynne via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: Lynne Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- libavutil/vulkan.c | 68 ++++++++++++++-------------------------------- libavutil/vulkan.h | 2 +- 2 files changed, 21 insertions(+), 49 deletions(-) diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c index e0208c5a7c..d98e863711 100644 --- a/libavutil/vulkan.c +++ b/libavutil/vulkan.c @@ -189,37 +189,14 @@ int ff_vk_load_props(FFVulkanContext *s) static int vk_qf_get_index(FFVulkanContext *s, VkQueueFlagBits dev_family, int *nb) { - int ret, num; - - switch (dev_family) { - case VK_QUEUE_GRAPHICS_BIT: - ret = s->hwctx->queue_family_index; - num = s->hwctx->nb_graphics_queues; - break; - case VK_QUEUE_COMPUTE_BIT: - ret = s->hwctx->queue_family_comp_index; - num = s->hwctx->nb_comp_queues; - break; - case VK_QUEUE_TRANSFER_BIT: - ret = s->hwctx->queue_family_tx_index; - num = s->hwctx->nb_tx_queues; - break; - case VK_QUEUE_VIDEO_ENCODE_BIT_KHR: - ret = s->hwctx->queue_family_encode_index; - num = s->hwctx->nb_encode_queues; - break; - case VK_QUEUE_VIDEO_DECODE_BIT_KHR: - ret = s->hwctx->queue_family_decode_index; - num = s->hwctx->nb_decode_queues; - break; - default: - av_assert0(0); /* Should never happen */ + for (int i = 0; i < s->hwctx->nb_qf; i++) { + if (s->hwctx->qf[i].flags & dev_family) { + *nb = s->hwctx->qf[i].num; + return s->hwctx->qf[i].idx; + } } - if (nb) - *nb = num; - - return ret; + av_assert0(0); /* Should never happen */ } int ff_vk_qf_init(FFVulkanContext *s, FFVkQueueFamilyCtx *qf, @@ -229,25 +206,20 @@ int ff_vk_qf_init(FFVulkanContext *s, FFVkQueueFamilyCtx *qf, if (!s->nb_qfs) { s->nb_qfs = 0; - /* Simply fills in all unique queues into s->qfs */ - if (s->hwctx->queue_family_index >= 0) - s->qfs[s->nb_qfs++] = s->hwctx->queue_family_index; - if (!s->nb_qfs || s->qfs[0] != s->hwctx->queue_family_tx_index) - s->qfs[s->nb_qfs++] = s->hwctx->queue_family_tx_index; - if (!s->nb_qfs || (s->qfs[0] != s->hwctx->queue_family_comp_index && - s->qfs[1] != s->hwctx->queue_family_comp_index)) - s->qfs[s->nb_qfs++] = s->hwctx->queue_family_comp_index; - if (s->hwctx->queue_family_decode_index >= 0 && - (s->qfs[0] != s->hwctx->queue_family_decode_index && - s->qfs[1] != s->hwctx->queue_family_decode_index && - s->qfs[2] != s->hwctx->queue_family_decode_index)) - s->qfs[s->nb_qfs++] = s->hwctx->queue_family_decode_index; - if (s->hwctx->queue_family_encode_index >= 0 && - (s->qfs[0] != s->hwctx->queue_family_encode_index && - s->qfs[1] != s->hwctx->queue_family_encode_index && - s->qfs[2] != s->hwctx->queue_family_encode_index && - s->qfs[3] != s->hwctx->queue_family_encode_index)) - s->qfs[s->nb_qfs++] = s->hwctx->queue_family_encode_index; + for (int i = 0; i < s->hwctx->nb_qf; i++) { + /* Skip duplicates */ + int skip = 0; + for (int j = 0; j < s->nb_qfs; j++) { + if (s->qfs[j] == s->hwctx->qf[i].idx) { + skip = 1; + break; + } + } + if (skip) + continue; + + s->qfs[s->nb_qfs++] = s->hwctx->qf[i].idx; + } } return (qf->queue_family = vk_qf_get_index(s, dev_family, &qf->nb_queues)); diff --git a/libavutil/vulkan.h b/libavutil/vulkan.h index 15d954fcb8..bedadedde6 100644 --- a/libavutil/vulkan.h +++ b/libavutil/vulkan.h @@ -257,7 +257,7 @@ typedef struct FFVulkanContext { AVHWFramesContext *frames; AVVulkanFramesContext *hwfc; - uint32_t qfs[5]; + uint32_t qfs[16]; int nb_qfs; /* Properties */ -- 2.45.1.288.g0e0cd299f1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".