From patchwork Tue Jul 9 01:07:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 50428 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:fad:b0:482:c625:d099 with SMTP id kf13csp84103vqb; Mon, 8 Jul 2024 18:07:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXC90eXXqeFd8BLF5jf9kijHn0fnqcB+mq3IcJBsR66i+C1KupDM3AKg4b1Vx102uQSNpITrH9KngeJ3o473r4TLpv3pgpA8zlcrA== X-Google-Smtp-Source: AGHT+IGfagl3E/yFF/oSPNJh5srYzeEbv5p+rw1ywZ+MLuMZcs7VkUE+YuXLNLmR/ITdXbKpMFPz X-Received: by 2002:a05:6402:3551:b0:58d:b529:7db8 with SMTP id 4fb4d7f45d1cf-594baa8bd1fmr668335a12.9.1720487276097; Mon, 08 Jul 2024 18:07:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720487276; cv=none; d=google.com; s=arc-20160816; b=QqmL1a20NLaBKedgzMdjPAuKZZJYlCu1Q/BYKKe9SfiOR2L5T3PjxsHDNqheHhNk7b Qo5X9sJfwPIk3gV4s/z8y09d5fKd2xDcgrxWHl/Rf+znVmGijlMbYDGPesOBKapaUBsd 21xuYTle4wKF10aV/u2NH1UTe80iiVlzix3XB/aKvB0WLOwlvnFbqJel77FaIhXzl4pJ 1wO1kRgE9dpz6DLhMAsA1KNiSeFhpQkMQz2UPM1Nuv8af2NTBIaoGT+Ga8Kcanv0DMwP I91TCyLLYhgvdvaUOBWMHPOuC6kTDrkHCyKPAi1tvaIuKg7fUfz/Misc9QWhQTbaCKTD UN9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:delivered-to; bh=ehbOlbNY7YO7B1W4+j3EYWHs6z2G/HbdSzDgDsTiwJE=; fh=nenT92/WZoU6unXd3J6UhGUdod4piddKfVtctNBOh6k=; b=jM8ypbttK5G+cCi0BShveHbHQtARaTUhFCjJrbxkeIxwcYVuUEmBycysC9eKVS4w82 j3FKl6zFh5AhXsoi2TjIgEFooq8FOE3FW7cjXHxmrzc8d6FtupmWM38hb2zeHEUjeYev CoimOtx3A0S5HUUPnQiAwQ9nLgGKubWBbjKbLLUBoUKz3Rt0GaRSl20EFFirrEXB9/rV WQwDD7RnXg7UybVsNLoepBbaVTh+nzIyLhXVKAnpGlrpxs/wanYW10gyQFSiIdiZXsw3 9KmQJn/Qwdk9PgyYD7vUSkDQo3gzZ+Qcf88KywsXhyfhp9Axvb5yCgoNFLrg8VFGSlxV unPQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-594bc3f32dasi388121a12.186.2024.07.08.18.07.55; Mon, 08 Jul 2024 18:07:56 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6DA6268DAD3; Tue, 9 Jul 2024 04:07:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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: , X-Patchwork-Original-From: Lynne via ffmpeg-devel From: Lynne Reply-To: FFmpeg development discussions and patches Cc: Lynne Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ASbuqngQ9ZhZ --- 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 */