From patchwork Sun Mar 3 18:42:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46737 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp2429554pzb; Sun, 3 Mar 2024 10:41:42 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVK5LPSvIeeu7ZSD1TbhgR7IyznxGHfPLSqUXqDj6rWz5pu3+bgtVPUmgN0iqYOFlBnK1BoLPbxksK08xVW5owBojzshUhoSPONiQ== X-Google-Smtp-Source: AGHT+IEmvmEVQGrvle6AgACPOp0GAdbivdR8GJJfndpYxw4MluuRI5/DXElsbaH9I3BscnbgKFi+ X-Received: by 2002:a17:906:f2ca:b0:a3d:e2e9:a7f7 with SMTP id gz10-20020a170906f2ca00b00a3de2e9a7f7mr4930830ejb.27.1709491302132; Sun, 03 Mar 2024 10:41:42 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r11-20020a170906c28b00b00a453d040f37si277036ejz.413.2024.03.03.10.41.41; Sun, 03 Mar 2024 10:41:42 -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=@outlook.com header.s=selector1 header.b=EUu4avmI; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EA93868D3C8; Sun, 3 Mar 2024 20:41:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2069.outbound.protection.outlook.com [40.92.74.69]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CFCDE68D3B1 for ; Sun, 3 Mar 2024 20:41:15 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QEggF6oJLdiCKqyzzEd6+RY/kDxXoPn+yPVM228lZuMZqD2WBuWY8BzOLYpKYe/Sz3TbYVugRbnYffOXiBAGLjeT9WXUo6KFyZCQNR/gmuckpGP4+WWkzD6/g8LsZOs3m1jud1DxkOzcF3Gd+3byIpSikmXmHZLbHUiOzEILky5qWUXxLiMlKiP/cUlLZPoSxkmQkfbVBDPZm3WITyWpUGZxiNEiRTMqrZuZAC2z2Y7DKWv7IGe/O8ga9lvzw2dulDyQOPQ+xVjdWkWXfxlz9k7vkYQNqsEofst21XcEUWdnlLw8hYYYfuYPJ+Nf3Ptox85+lxY7SIYxYnAXLa3zyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=EGztIC29o1RKW5EAG0Nja2JQijbbSXcQXTjR8VD+wfs=; b=fF1d5jmIDqNlGS8Rsw8OCcJllv9UpGf6Xm3JnSFZmawy3I1r0XGCm3DEjAb8d8tJ4mFFG0Tsk+ox9xS4pWQPK6rtJ55QpJZ/kCa440ExW/vrmQQXtGkAPoMb/2/95/c9dA8DEU8JLOSxbtBZQf4kloy/jD5beWoxOSQt+bPAjjOVADDA0W+rOBvbu2jJcpFKIo3RWEqLN3uVGPcuC1Op83ATVuiwijJofMbYzQr/9ZrB1a+s1WNSn0BrjAKl0vWOOwTuCPCu+2/8AefaHzlSSRwtSTPKxX8xhSfxHc9oOGPAbIeYClYyR80WTN6en1U9+IRmoejobnbvmjZ3F3FD6g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EGztIC29o1RKW5EAG0Nja2JQijbbSXcQXTjR8VD+wfs=; b=EUu4avmIz37vM5h261j7/CmVQjvuvzvpa6errI0nMV+QfoeM4tHKCqKoYCemJeKegkKCp0eNpfvn4zTHBBuOY+EH//4tpX+tkL+QBlhfOSVmd0/lLmbuVrwV0DaStLDq6rkyvJAGMRBmGZkc8Suu2l9trFg1el0p67/DVdB6WKuWIsK8fys917fYB3pfch5JXnUVjKLjRXgUJfGNmLNVT7ow9mGdaq8WTlgt3rxdSQHXQdXbuluUy/Nl3UnvYFJn2pGS8fxofgcy623TUjXGaeMYqAhuIDag93x9/Pw2WJDqrQSi5oxtllxD+G9Q1M+c4oJJZNYKF9sE8FbHKBOdJA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PRAP250MB0538.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:295::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.37; Sun, 3 Mar 2024 18:41:07 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7316.023; Sun, 3 Mar 2024 18:41:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Mar 2024 19:42:48 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [euWGPcR/6poNgwDOx+OoQ4eMEvAzFmfxrTwtoukUnkw=] X-ClientProxiedBy: ZR2P278CA0066.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::20) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240303184250.541590-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PRAP250MB0538:EE_ X-MS-Office365-Filtering-Correlation-Id: 578b318c-276f-4d90-87af-08dc3bb17d2d X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqnx/C+6DC/TIciLJ1/n0VpfCzQof8J3WE9bKAStLR1CzdzDd0KCKBotn5/psVs0t9Q8znUxoHLcNWlrSGUmq6kszShjg1kSvKUa9j5i7Y6VsBT3PJ4ETfkd8DH6SW6q7rM232Rz/ckZIyHXxpu/WtiJFraD9Oowb6PnBQWrDLz/3kQelLfexKRznvWozpZftIhGLwc66OPNxuJjaSwNkFHSV6/vux++QeaVpLGaJNKIDPF/NAzEYAtK79v9j9l4CK5gkQIAqdrDWLz17Z7464vpQnAeUqEKsj7xcp4W/7hgP+XOEFyioReBvSSEc7gws5we5oxc9npaATTJRzI3kNqE5nIeueQpXGMWuou1OqFdIavXYz2LCr/IQFFepHuACUsZp2B+GEHiXzTGDyaMyzE6fQreD4OYj5JenKquoyY7xFktvdIi5VLTSK+fRquHh+7UveYGZ3C+CLreG8CmGNrsFmPFkUplUjpiW81lLWRFpEkbxiJP6d76kam6XFF+QTo/2sHJ/+eWP4ehRHN6lkMoTfYL9xOl3MlITFh0+VP9X5d46ZA5SHm6Jj5wqX9z9rbVkwnN+VJlmkW07uJzxdYmcy9K3jZHq8PiHK0Lk47ImrHVBVqghMU0zPg8i1H0jw4xAiKls0RCIiC1B/+xJGIRU5LcVtfmHgEYYVz7KjV3axzAam3hxYA+QzVbljg3q72O0RCCFjwxJvU27IsuvbbiVTV9MRqkE6I8sIL71dl4YksfJM/VRYDcKkT+8AcNqY= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /x9FuT4uD4loADdpsrqns7hut1gDbRdEzk0aCycGb3bUDfCleXku3NLWXDE/YzRbot+5mUOIgb8BVoHF1JMuZTKcC51oeASpVX/1yB24Evz80gJBqb23IUvfL2AMfOYLS3rNMwkGK5BSsRrO36lJygZj5knLMtbDNChvdw2sYSxCRrM+LwUjVGmkeSgldb88297WDd770eW6muLyqKk5yDueUCiXrHWyUTBBU4nUCpG8oV7IcThKtdt8ixVypw7Nez+Td/XrYORQlsZ2wWTbx1UKL7wZ0mSfEsL1huA1H9rxtJmptl3cumPMPwD56vBHzVDacD/DgNLkLwkcr5x2bMeUeCBXNASu6jL/KOEPtp6N4pFLvxM7iddAudE3bxuITp2NC9rwPEXkFE0QJatKUnJVtQtReADR4zsuymUoCP6PY5hR4mYvcg3KvgyA/WKAGCebdbGnaumD+lKNLZSn0ACHzIH19BlDTaJuY3rGbEhhiIBfJrwHhKJn7gHEAZNJ1EbQGOn3VUREdfNMSmegCELVGoe8tnGiAtAAHzfWeqRhcUJkyRb37l0UawCDEAr1vY45x+4BY2+6bTeIaR40FhhR9e2WBftxcC3tR1Ieop/I1/lSyZxJM6Lh9JGYEosO X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gj1ztzYjVa76xwudTvm5UeQPvx4YJVLZYZh3dC0+GlnRIoxfT0TIdUBXQzvlR3yEUkhN+zCvXk7LrzChobnasJOqaczRJTLVk8YtProAM16oFiwqfplZMhQXYU6mZrC6PIUbnVHP/xssTRYGTTMnXf3ZKjGKldkPmUSW7Cm1SRGgO1SOSXrcR6E2m20zIZMYlrkYIXps6LY6xcvn4CywNAysZTAOAxEqLdkNwy7CjbG368O1Z3vq2bTBBebIwErvzp09WnAvElyDMXdB/PsuMX36ZzBU/27LbBUwdThIfqMlESukU724ON+Ol3GU694/rcEY/TA6fsrwqFuSsJnfV99+KiBdnJA9NZ1NolcgKR6ZwAbgrQ5cMtuiWjz18aDQDhKsuxWnQzTYR72igXzFGFHgZcSTENaaMWd/5erum7RRHAfbNNvjKncT5n8jSkP7Ol6mvVgU9oKfbCW5yVffxKdnPcjmT4xUPCFFF/RRtQizssfslLMIq2fAaf/g13fl/10m6cbpsFqUAfmtZdqH0BxcumJJcP9jVT5zrOIP+ndfWthCKPVMG0EnAc1lRvKM5x58Ju/nmC4x5SyaVL7M3K8GKWFgsRC8FGkF7tq3ZdtFUmfB085xkbwDOswm/iXj2MkgB6l3rBoOAnRJI+TeegqBNjr0FPPFoRJSw4bVLazOmHtnl76Lim6G3SLmobKI0NXwZOSNL5BwlIjLmfnXon2s+FelC7nI47iYdQoQA0vq8yMNBk2AyllbTBTcQ6tDhvVO71QRDNBrk/GY9HtlYcX3+tl7t59PZNXAL6taG2vftP4RwiuqlvsbC+kDBFG524yZPQFQ5Wj5wYqR6RdQ2lnAujyICeYGH7H5cgpMBW1PVHy7fMbc+sZAgW9ecGKfgGikF3RxVggMLTj/je5IK4UpFDDiv1aJvshmzHPudrejWUbj/CJtNzcPEf7CVQlX7tiK0ds2gpTsxVWNlM+NJVTOS/qdf0ffYU9AerW7IethTd+TXy9cSQrAMKYNMDotqIMWVLCFMseKg/FadyPoCH/4jOU5GP+hvErXE2QMjDSnpDygP91spsljAiIs5M1IWTgsTrg3TMlbRBxDsBu/Ncvgzb7PPeRnYkOAfidZrEuK/KSPK5fzqzCruoVzcLL1OCMwO7ZIKNRFSGsFUsgmsQrgtr8reSDtvk+OWKzj1gXKHcEjZMnpZXmZTAt37ySUnKNT93+pLC4L8f6pLhbbbqnqGEh9TY834XdtIKZfQQ6JFO+7yefgv1XSsih/DnwgEXvyqWv1Y7dez87R0Xk09g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 578b318c-276f-4d90-87af-08dc3bb17d2d X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2024 18:41:07.7678 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PRAP250MB0538 Subject: [FFmpeg-devel] [PATCH 6/8] avutil/vulkan: Make ff_vk_set_descriptor_image() static 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: b782l2yndqTE Only used in vulkan.c. Signed-off-by: Andreas Rheinhardt --- libavutil/vulkan.c | 11 ++++++----- libavutil/vulkan.h | 3 --- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c index 4392a77d6c..c725634fef 100644 --- a/libavutil/vulkan.c +++ b/libavutil/vulkan.c @@ -1659,9 +1659,10 @@ int ff_vk_set_descriptor_sampler(FFVulkanContext *s, FFVulkanPipeline *pl, return 0; } -int ff_vk_set_descriptor_image(FFVulkanContext *s, FFVulkanPipeline *pl, - FFVkExecContext *e, int set, int bind, int offs, - VkImageView view, VkImageLayout layout, VkSampler sampler) +static int vk_set_descriptor_image(FFVulkanContext *s, FFVulkanPipeline *pl, + FFVkExecContext *e, int set, int bind, int offs, + VkImageView view, VkImageLayout layout, + VkSampler sampler) { FFVulkanDescriptorSet *desc_set = &pl->desc_set[set]; VkDescriptorGetInfoEXT desc_get_info = { @@ -1758,8 +1759,8 @@ void ff_vk_update_descriptor_img_array(FFVulkanContext *s, FFVulkanPipeline *pl, const int nb_planes = av_pix_fmt_count_planes(hwfc->sw_format); for (int i = 0; i < nb_planes; i++) - ff_vk_set_descriptor_image(s, pl, e, set, binding, i, - views[i], layout, sampler); + vk_set_descriptor_image(s, pl, e, set, binding, i, + views[i], layout, sampler); } void ff_vk_update_push_exec(FFVulkanContext *s, FFVkExecContext *e, diff --git a/libavutil/vulkan.h b/libavutil/vulkan.h index 184d58ff5c..c04a43e278 100644 --- a/libavutil/vulkan.h +++ b/libavutil/vulkan.h @@ -485,9 +485,6 @@ void ff_vk_exec_bind_pipeline(FFVulkanContext *s, FFVkExecContext *e, int ff_vk_set_descriptor_sampler(FFVulkanContext *s, FFVulkanPipeline *pl, FFVkExecContext *e, int set, int bind, int offs, VkSampler *sampler); -int ff_vk_set_descriptor_image(FFVulkanContext *s, FFVulkanPipeline *pl, - FFVkExecContext *e, int set, int bind, int offs, - VkImageView view, VkImageLayout layout, VkSampler sampler); int ff_vk_set_descriptor_buffer(FFVulkanContext *s, FFVulkanPipeline *pl, FFVkExecContext *e, int set, int bind, int offs, VkDeviceAddress addr, VkDeviceSize len, VkFormat fmt);