From patchwork Thu Jan 27 03:39:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 33879 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp2089345iov; Wed, 26 Jan 2022 19:40:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJwXPsCazfgL+zE9U/at47T+W9eCcjuUx6g69HWQxjHFlSkSZsLlvdjh8a6s2wWU6ql99X7U X-Received: by 2002:a50:858b:: with SMTP id a11mr1847174edh.303.1643254818789; Wed, 26 Jan 2022 19:40:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643254818; cv=none; d=google.com; s=arc-20160816; b=X0lGE8waw1ixloNCR+BFNZi8qcriy21UNBbl9YzRW8hVx/K5gPigEkbCuhIpcelHZV jgdjYkbBEZ0qVoOy3nAxf1xPqSVolr4QmKvuuOxggdpYdhBcRbRsRTB/PKqYyH4Gr4dU 8JKMK7+8F3XF8ejejgY3tI3sy0WlKgAbovRIMNYWeyo8/fGbakNtbK+0+tWW+vc5JOSa VZzFoJspgntIUUQ1IC6p6ayTSkz8qWctEJaNyswNbk/+JR0Pc9/SOIyS3SPbr5/Qaqi+ t6YMqoHjdnvC5PFdLkZ7jLOvEgsNeXBirPDCOOWPHQUHxbqCWnU35HISy+00qZKQZGWc lhCQ== 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 :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:from:message-id :dkim-signature:delivered-to; bh=hA5e1Qid1QZ1XNG//sd2WEvDT7NcSpMtFhG/3mu7z98=; b=mm+UBHw3NaNuyjkwmn9v0z3Cd5UyifIYybBe4lhFQErDRXyaxaT1bkcrhurZu2Rzz4 pGPHbHLlu0xOBlnADRzZWEQZZhYZnd0cVSM75athnYJMGWa75GyjepNo6v2CsL1iMi9W h0XlICf8x48VIGQhvVtG7U+2r044yroFVc4z2sNkL4w/ul8hGM3K0dGLh8s7IWm8W03l wwKH/Ptz1FCzvxcufFZwfyCmdqKji8709B9V2HaMACe89+1YYA/rNGiL0p4OgI7+yTIa 65f505PS2VaUMmHsm90G+6JhKrmvt0WA/o6QZU8xmAGgaWxU8tRtgQme+rubGN6fof2l 2xgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=XKZQBDwv; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ce28si667986edb.521.2022.01.26.19.40.18; Wed, 26 Jan 2022 19:40:18 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=XKZQBDwv; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 32F4768B1C5; Thu, 27 Jan 2022 05:40:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-239.mail.qq.com (unknown [203.205.221.239]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 01BB868B040 for ; Thu, 27 Jan 2022 05:40:05 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1643254791; bh=VuGZK7AMnFXji4FRtx5xmtd5UquRfd6rlyIOkUVCzEs=; h=From:To:Cc:Subject:Date; b=XKZQBDwv6dMshWW6+WAd5CbeQUD9YA4MY8RRqJODLFkp2gC0UXvVyBePHMVTTxeHY NMRWEN3VIm2pUYmsZqtBcN1+/AzFaQQyYAv3+TRnjs/DXfMXQAlKle8lkeylHm32SK u0keh51m0zWRaq6Thz6XbZGwm6kHNGk9EWyR+bd4= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.72]) by newxmesmtplogicsvrszc6.qq.com (NewEsmtp) with SMTP id 9F20C668; Thu, 27 Jan 2022 11:39:50 +0800 X-QQ-mid: xmsmtpt1643254790ts1gb1c79 Message-ID: X-QQ-XMAILINFO: NhDhJCJPIfnTeoZ25wnHzTwWVkhPEOkjzj7DVXTHaYO7UmYouFYZoAOdpjwe9M zznfSnJDLpIHVs2GmU+GgYZ9gPcr/9OwJ0aWpNvdaDNzLGYd4UMDJFE/GBoJIAovefOqftrKHwO6 6OVH5rgoOeUWvB2cd9G8LgahS/3TOK2sH33TgAuvgsEu7rj9/9T97ifGEip5InJ66OEbuGngUq9O Vk2V0XHccFdrzdjBm2tKqlmRInCV64tBR5fxfzQYVm5OtTIoMwMdRdx0hMWh163rVKhot/Wgo3/Y q4bPdPBHuy41ao4z4ci/TTkm9svFn9EkuZ26Xl2L1L52h9K0AxC3jSwEwrRB6k1dLsND4Wt3b5Hy 4gyUiPwfKaonKXvx46IHoPAzKrw6x7zMRBC0+7mTLmDbMcmDkTlioYSZaLs0tKCLAbba+/4CUD5N WM0zEz+rkVeYJCLqIfd7OEvYC1QFOH5sp9Y4cXbIkvBAJyPyzroKRgIQiXgaS6064ipOjML8nMdF proieGNXTuXVeeN1ZuMSwU6k0QmqRq5EDaF9n9px7UpoJx9grfKBmDDe7ACSZNzenmshxJ1jq2rW bTJBwck+9teCEDj7VUkfYGmLIkuWyVaVsisxhoeYsyOKJ6OUcOLz3mZ4FqBZzxXliHVIYpFLyJMj eoorJzT2TMhyH2mfAG+sbdXCZTojkHB9t5bkIhadelDn0yZ64iZtL4lAX0WMa0KLiaNnRgV4zVBO gQ5CBSx+gh/OldpDP5Fu5FsouDNje0BYW6N+J4pYaoVGe8XobqkrJGQqAn+UjdaiGFdO3m72DIOZ 464bjAQOrekhzUecOV4aiV7jTl3ySUk2BIYjMREbGvfZUcUrbXzZwc+Xn0wxuk4Pc= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 27 Jan 2022 11:39:45 +0800 X-OQ-MSGID: <20220127033945.18009-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] hwcontext_vulkan: use VkPhysicalDeviceTimelineSemaphoreFeatures to check for timeline semaphore supporting 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: , Reply-To: FFmpeg development discussions and patches Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: E1fkEIFDb0Ij VkPhysicalDeviceVulkan12Features isn't implemented on MoltenVK yet. VkPhysicalDeviceTimelineSemaphoreFeatures is less versatile but simple. None of device_features_1_1 nor device_features_1_2 has real usage yet, keep the code for future. --- libavutil/hwcontext_vulkan.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index ae19fc2ab6..2e219511c9 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -1321,8 +1321,16 @@ static int vulkan_device_create_internal(AVHWDeviceContext *ctx, VulkanDevicePriv *p = ctx->internal->priv; FFVulkanFunctions *vk = &p->vkfn; AVVulkanDeviceContext *hwctx = ctx->hwctx; + /* VkPhysicalDeviceVulkan12Features has a timelineSemaphore field, but + * MoltenVK doesn't implement VkPhysicalDeviceVulkan12Features yet, so we + * use VkPhysicalDeviceTimelineSemaphoreFeatures directly. + */ + VkPhysicalDeviceTimelineSemaphoreFeatures timeline_features = { + .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES, + }; VkPhysicalDeviceVulkan12Features dev_features_1_2 = { .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_FEATURES, + .pNext = &timeline_features, }; VkPhysicalDeviceVulkan11Features dev_features_1_1 = { .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_FEATURES, @@ -1366,7 +1374,7 @@ static int vulkan_device_create_internal(AVHWDeviceContext *ctx, #undef COPY_FEATURE /* We require timeline semaphores */ - if (!dev_features_1_2.timelineSemaphore) { + if (!timeline_features.timelineSemaphore) { av_log(ctx, AV_LOG_ERROR, "Device does not support timeline semaphores!\n"); err = AVERROR(ENOSYS); goto end;