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 4499C49B38 for ; Sun, 3 Mar 2024 18:41:48 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 93E5168D3D8; Sun, 3 Mar 2024 20:41:19 +0200 (EET) 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 2909868D3B1 for ; Sun, 3 Mar 2024 20:41:16 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UyClqi7SEVihJNAi8aPXgXbXHkiMQKs7XvWAod/eT94T2YcOg8LC62GgLxAmBqZcLrVjAUgatnsDqPtHj+7mixqYbkmyWbwP3JJVhma1eZFdi2b9//ihbaspDM22t1ZwaPtnISX5nt3qhI0V4CRUzbkLlM8XzgbCTJCe3r2QlrxTcmdIr55m9xkhMpBqHXRYL47aWLXqlUM/gzaOVu2M0QY6Vp4lOfY5IoR6WnV7N4WXRRLEXymDiU+VlbNxL8Os/mA5X+2c9NZ8uvmfLt4VDwooBsiSDXiZSlsFD3zelmqecPnZiHhqs8eaKY7F0Qpi6NLv3CBxj3cTe8F/TDVs3A== 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=xgOTay1rE/XVm/SxLXBmW0I3CGqkRb8rvUGCc90g5hA=; b=UJlK7kKhV0zFnv+RfDeGvj0VoK4DNQJMNpcURqSjOJyG+aFTVq8Say2VVoHKUVvXrXWJslu0yY0hv0UsobjR17aDa3to7nisLD0mtip1S8SmfVH9Ag6zexopdGkr4+0Au97zDv9/MdaQqynh3eesSAkyPURpKcO9XJ/FcomfCDiZ+ZAemoU1Dd6360F2RYitC5IGiRPvztizOaK31TG7sARDFqrvXsnWmPk3wdcLo/EpIeQb8pQPhZOnieNAMbhLrGecwBEM4TidOvzX2kt2axUtr3DM+lLEpNqvmJ0nV0G/D9tzyMQ2qOLg7Ibft58JWMDdPSDn5/uGekXlQsi7UA== 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=xgOTay1rE/XVm/SxLXBmW0I3CGqkRb8rvUGCc90g5hA=; b=a5f1Rkr4rwJYi+0u8SNKz9/39o187EUTANjfx7ASFNX5Mp+7EY12hCA4ee6egeyLcz6kKKvEWAki+LvoqqI0gM0MMdN96PkioTBmU43TblOEOnB1WrynQhZGRu2URXidJ3BfDyvof5VvXkRs6X+1chRgQIku8dTOQWbWyF0wJUuCYpMfY32OJnlxreHglCwezbhvebTHLr14Ik5vAYEY+GvskxL7CkAkthoCB5r2wvteifLbC1Wq0/kp4YA+yjBcpK5fzBnAM/TAa3/WOul2DQnXbzYsubUqKUJN+kSoxHUMgOQhe/azY3iW+o5gljmB+0D2ZwHPbzW4WTCRO7d0uQ== 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:12 +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:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Mar 2024 19:42:49 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [K3oNwwOPT+tCV1MWB0hWOiXFceJb/N1tPWAVmKoYI24=] 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-6-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: 3a4c0398-57dc-4c7c-e55b-08dc3bb18048 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqnx/C+6DC/TIciLJ1/n0VpX6i9u6U61pWzF+CV9jW2TBq6xlo834xuJyYM8xSKO/9tJODJLUVI1Xc+9k5VvZvvDXWVyrU/3mKxRGnXsTzgBRhQDvGzXcqf8E+44hAuctaDKdlZNxLk90RuMWnVv6UnKRqMIPuzuU+UjcXCgcXgVCdC8XpU2cXiCTW40B3787duHZSRLA7Db4mO2IiFLLYDwzLEcvrHP658XC8+WhGtPun2JygQ3Q2ZP4qZo4WLfw/W3UXLnwW45g9aF94NmRnmfdY3X49Hwj7zR1RcfjApRLoO1bh5iuaB4r8lnnxEQMCEUBWUm19ad6hNaQCYhO+ZWkOx+26kcImsfwUwKJkXY+/RShQsh0MhX5amdptm9AedPJIe4D59vUqJK8ChrfkBBKDVV1FToyyvnhG5FLsYZrDe2k8MPfCJfF9k3zAT5Ne3sxCiWz6REyOl78IEepgamtKKTPBf21m1vJWJ1+4yB79hHk7YNR4A2rShBhcMx4oPbTr4zyaooSxqidfQ2SvNt3xd2nNAXKQDEDn+ayfaJnbv/o+hpSwG1FleZcswlBYJbaTQucbIxfbuoU7z8M32px4vBcMDc5OYbBjFYK5OVpS2EE90JWu8Z7wstn/t9AjHPXhaESUbaH/GHp+SaKi6B0Pbk6cdu3a3B2Iaav4IbfVGLqe5WbEIn6YVZ3PYrt9yMtQWrTbqqSNQO+OTmYdpheYMrYC+RXVg4XwmE8XkZtEIkCuUcvAb6AvRzT+J99A= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XKt2OTDppFZFTAnaYaFz71ghcg327Mzdq13f1mcXFHf2197ipMmQqLfEwt3CDqkHYbwMquIeSvON7sCHxxHmosbkLSlpwOZfcVE18hrBs7iRqfST/UMUqi8aal5tCsPFVYWsLetkbZnG/q7XzTUGUYpIao92/nF9qr5E8c84Tk25YIgv7MInEjuqwgf5bmathNkkHOVlDGv7+V9Nsr+RFyJQYfNGh+qI/QfmI8uvi5zY5v1kCnOo9kpuv30NbkD1NtWiR2yY4DVbzzwKTx2f4Sj01Uk4cOGtebpvx3BD1AQvZQMSVyTEjfDKga7ePB3vuo9o0KJI6ZezWHOE7C8Yb11cbpvA9zX4C0WwKYEUtH5ediN7I7h7jiqT4jljyaeP5zyzrMMiE7D0lUKacNV2t/3kFpkaWRVBAz7Z0j2Z6hw0BSgKq+1lwVxR6Ombq7uFf9ro2X94cZrd0M7kNK9n49bpOScVP9Gzgs5lzquBwW9IiRINKVIBki/NtIpbjvKJNjktrUUTs/CCh8NISX7cPSd6yEGDEgKW2UcdQ4FV5EBggZh0McAvV8z2lVnELFzuD0byTymMCsjoXwQMV0JkhuR7mtslt8wcdewVHdMN3xaLuxdI4q4QvYOePrjxS7z3 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?YNcnjViG9ABv5BtL9kKNsf07g3hckvgEpkilbhEQ/uh909NWZSs8ELtkA2pl?= =?us-ascii?Q?QMtekR0U+YxSUb9lMQ3xZUB5ZkdyFGrVRs8pv7p3LXH0pIkl9qpOMMzMs6ml?= =?us-ascii?Q?vIJxo/Ui4D2m/MWTBBtk4H7vl4u/Bxon4n6WfujRJoBZjFswu6XCBMNk7sEl?= =?us-ascii?Q?kLwj6qu10OEdcGPE4hjSZ0mfknKiErmikZM/EnAeF1/aNT2z3rFzWv7d3Boo?= =?us-ascii?Q?0HQMjhtNhe8Wgy1Hm2CQkk9S/ip6dJKBvcLHPBCA5lFdtjdWsJpvzh57JArf?= =?us-ascii?Q?Ut5zfBaJOKQz6BMpxXyOBY1JrnJYUabbzyQaKTHFF6wEUIC8wGmqSiVvRpvr?= =?us-ascii?Q?wWB/Mq59Tnx3IKQO3Fm29zpIgh3SFp44es8cNOVPCLiBKtW3C2duCz+iQqG6?= =?us-ascii?Q?VgdkRn/OeBoKqxd10Md0FVD5AsCRND3pIC8FJ0ChUtbZ4G9zFO4SbWLDqXh1?= =?us-ascii?Q?NsC4ZpnF040G255Uf1fFn10NCuPnY1sOo6CU4qCrc8Kmde4k6zQxce4S2/eM?= =?us-ascii?Q?PQPnsRQtGLfPU8GF62nJoz1rXf8udWkB/dnLnCefjnaU0oZ8HYSaQKbXVZNn?= =?us-ascii?Q?NEkqPzYO9bm2OqFYaHQHRwXeSCm+VaKrnMRE4dw7AJ/INnxbVFJTxzTxm2qm?= =?us-ascii?Q?drr3B1/76HIjl5qpGURB0hTmSjXBLLI/zBax1iaELTYJm7Lr1QhGOnosYsif?= =?us-ascii?Q?G1d3lpHdZBRl96CcV8qVHxXOLDMTdpEWF1GlZxUzyia5setwmJV2MQW3c6N5?= =?us-ascii?Q?4SFpXLhbKRCP+1fQlWO5gb2qFElfgkc4+XhAKLRmntAxjypd5Giytt2oksjZ?= =?us-ascii?Q?oXZaLVgEDBLDIL+4rRXBmyCAxSDhNasnaGRnKQ+NflCzwE/MO6OwUXEytAYp?= =?us-ascii?Q?RExqHetUANJq46oTjkD82UZ6oasYUSmVQR75x/4m8dtsfmOaj6c8YBmj4I8r?= =?us-ascii?Q?r6H+cexP0gdkVc3d/MVR2lqy+oX37pEvdRmSOZkIK/KbNyj1VwsbuPPaMu+h?= =?us-ascii?Q?Wdcin6cJbHfDbFWkk+KFcYTcCxY/WiDS8iF7Sqc3eoGANV4zIdGfRfTAW+eb?= =?us-ascii?Q?0ClbDvQFb3yaOsQssibGR09lvkZAG27eKqEXN6jvcqo10aw7qW3/+h5hO6Qt?= =?us-ascii?Q?zoCw5aqIvXLljED9hD0Bnt80tWZ4Z9wnRw80or89aaiAvePB5FVZBg1ixaK/?= =?us-ascii?Q?s0stgUi7tPzTy2HO4tli0dgy437ZMinK9NRE/2JWtr2T1uuMy6Z1w4dDzduv?= =?us-ascii?Q?YaBr5mQdjvLvkvuT5ytn8npP11eNYuVR2dQRdaWELA=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3a4c0398-57dc-4c7c-e55b-08dc3bb18048 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:12.8986 (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 7/8] avutil/vulkan: Remove unused ff_vk_set_descriptor_sampler() 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 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: Signed-off-by: Andreas Rheinhardt --- libavutil/vulkan.c | 27 --------------------------- libavutil/vulkan.h | 4 ---- 2 files changed, 31 deletions(-) diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c index c725634fef..67b9526255 100644 --- a/libavutil/vulkan.c +++ b/libavutil/vulkan.c @@ -1632,33 +1632,6 @@ static inline void update_set_descriptor(FFVulkanContext *s, FFVkExecContext *e, vk->GetDescriptorEXT(s->hwctx->act_dev, desc_get_info, desc_size, desc); } -int ff_vk_set_descriptor_sampler(FFVulkanContext *s, FFVulkanPipeline *pl, - FFVkExecContext *e, int set, int bind, int offs, - VkSampler *sampler) -{ - FFVulkanDescriptorSet *desc_set = &pl->desc_set[set]; - VkDescriptorGetInfoEXT desc_get_info = { - .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_GET_INFO_EXT, - .type = desc_set->binding[bind].descriptorType, - }; - - switch (desc_get_info.type) { - case VK_DESCRIPTOR_TYPE_SAMPLER: - desc_get_info.data.pSampler = sampler; - break; - default: - av_log(s, AV_LOG_ERROR, "Invalid descriptor type at set %i binding %i: %i!\n", - set, bind, desc_get_info.type); - return AVERROR(EINVAL); - break; - }; - - update_set_descriptor(s, e, desc_set, bind, offs, &desc_get_info, - s->desc_buf_props.samplerDescriptorSize); - - return 0; -} - static int vk_set_descriptor_image(FFVulkanContext *s, FFVulkanPipeline *pl, FFVkExecContext *e, int set, int bind, int offs, VkImageView view, VkImageLayout layout, diff --git a/libavutil/vulkan.h b/libavutil/vulkan.h index c04a43e278..15d954fcb8 100644 --- a/libavutil/vulkan.h +++ b/libavutil/vulkan.h @@ -481,10 +481,6 @@ int ff_vk_exec_pipeline_register(FFVulkanContext *s, FFVkExecPool *pool, void ff_vk_exec_bind_pipeline(FFVulkanContext *s, FFVkExecContext *e, FFVulkanPipeline *pl); -/* Update sampler/image/buffer descriptors. e may be NULL for read-only descriptors. */ -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_buffer(FFVulkanContext *s, FFVulkanPipeline *pl, FFVkExecContext *e, int set, int bind, int offs, VkDeviceAddress addr, VkDeviceSize len, VkFormat fmt); -- 2.40.1 _______________________________________________ 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".