From patchwork Thu Nov 2 13:00:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?V=C3=ADctor_Manuel_J=C3=A1quez_Leal?= X-Patchwork-Id: 44481 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e15:b0:181:818d:5e7f with SMTP id gk21csp549739pzb; Thu, 2 Nov 2023 06:00:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFbqe/8wrgJMvDN8xjcXyYH7YsA1c7/mmnEZkKPzTrTU5LWstc5HcqlyDpsvPAnP4+1QcTe X-Received: by 2002:a50:9fe2:0:b0:542:da34:cb7c with SMTP id c89-20020a509fe2000000b00542da34cb7cmr11688177edf.19.1698930021346; Thu, 02 Nov 2023 06:00:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698930021; cv=none; d=google.com; s=arc-20160816; b=ZV94zxRNbEXORykhpVYnHMIWoaRXMbGST7NaEAPG0iV+SNoq+q8iaaOTS0L9hpkauh RXRhNgrS7N/nflv/Bv5jyk4M5TVI2c39CwaU5obF27QXkvOA3xe0NfV9s85NScZ9sKmC oyAAUkGU18k0tczwZ1mzJ15rLcfBPzccXgzSWB9mSOyCsUMHPSjaGnRe7GDhKNrAodLj E0/eJBMG3sTIKmKzs8C1/IwdQPxGAdGjYMwtZQNDeoAOa36EsumCIKAPR5HPgiD9qCtp js/A2asTxofTCy3UbY8m5dm0unGS+aeQVeB7+hIA600ggyzVmME8OWR0yvhAYESr7nUB zkjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=JxDN3xm3fV2OdyTW5AErzA9PpTjQFjPIqKRH3KiWbxI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=A+YGn3zsXyTztOJVOdMSazI1A56ZsIQuqqVMQyM7ndS6ZuHf0yzfLz7jt/dIUCr6cG z1fMBjV6CzvKaLiZVw97WOCBYUWdL1VPOXoZXgsQrzlxzwOfesLT13ZlYEWzr7oeo94Z KdjxJzbE/qRe6qpcje4QDkbYOJqrLvjoJg5QZ3OnZGgMMGpEATzbWQX3mTfX5lCTI6So dZ3BnAZ8ipCXKywN3Y4NIOf1/ChwtztbYkUJU90q3IqhVEQ2/RIO1ujJkM9EJ1x7SZhA yOxkJKfzuSGjb9Z+/UvX/AeSz1zoakPlgVASBAJe05s61DbitTJ7OD0EIfMhM3cMA7wE lSKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@igalia.com header.s=20170329 header.b=fRKqMjlQ; 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 dz18-20020a0564021d5200b0053ec5df7d56si1664670edb.204.2023.11.02.06.00.18; Thu, 02 Nov 2023 06:00:21 -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; dkim=neutral (body hash did not verify) header.i=@igalia.com header.s=20170329 header.b=fRKqMjlQ; 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 A824068CC6E; Thu, 2 Nov 2023 15:00:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from fanzine2.igalia.com (fanzine.igalia.com [178.60.130.6]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 75ED868CBB8 for ; Thu, 2 Nov 2023 15:00:06 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID: Date:Subject:To:From:Sender:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=yjn5t+9ctEbOWiGeGwmYqYPvOghzC7GwhWaRMobYsjo=; b=fRKqMjlQxjmNJyo2fZ+vr6t6D/ O6H3/j1j6wOWkcfbztaxtQFIJrVLR8UMP5gfxxKnWe2QcJCAv56PIzmQOET0aLQbAhxGJMHnnSfpQ xeaEuQamMZYUrXY6VKuhUIw0dmhBWmEO/1ykcE9XwbA4pCdX2XujfnTIVXkYnf4ObpI0h0VuDLSuF zp2P+dMNOXaYHyv1aaLkPcetxqTi39rqpc3GN3ABPiOdzhYdaUCljkPnIK9FCd/hdaHkw4ZNN/u0F ORzzstDGaNGXDKmkNhhNp7df+V8iHnW874DPnQDfk3nECI/DM/DvO0P4AopOLoRiDUhCcareZ5FQg 0fo0Zecg==; Received: from [137.101.241.245] (helo=octavia) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1qyXIq-00GDVf-6b for ; Thu, 02 Nov 2023 14:00:04 +0100 Received: from vjaquez by octavia with local (Exim 4.97-RC3) (envelope-from ) id 1qyXIp-00000005H9b-3noX for ffmpeg-devel@ffmpeg.org; Thu, 02 Nov 2023 14:00:03 +0100 From: =?utf-8?q?V=C3=ADctor_Manuel_J=C3=A1quez_Leal?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Nov 2023 14:00:03 +0100 Message-ID: <20231102130003.1257572-1-vjaquez@igalia.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avutil/hwcontext_vulkan: get VkFormatFeatureFlagBits2 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: g5xJrOC5WZA0 Rather than the VkFormatFeatureFlagBits enum Signed-off-by: Víctor Manuel Jáquez Leal --- libavutil/hwcontext_vulkan.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 8481427b42..506a218a42 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -298,8 +298,12 @@ static int vkfmt_from_pixfmt2(AVHWDeviceContext *dev_ctx, enum AVPixelFormat p, for (int i = 0; i < nb_vk_formats_list; i++) { if (vk_formats_list[i].pixfmt == p) { + VkFormatProperties3 fprops = { + .sType = VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3, + }; VkFormatProperties2 prop = { .sType = VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2, + .pNext = &fprops, }; VkFormatFeatureFlagBits2 feats_primary, feats_secondary; int basics_primary = 0, basics_secondary = 0; @@ -310,8 +314,7 @@ static int vkfmt_from_pixfmt2(AVHWDeviceContext *dev_ctx, enum AVPixelFormat p, &prop); feats_primary = tiling == VK_IMAGE_TILING_LINEAR ? - prop.formatProperties.linearTilingFeatures : - prop.formatProperties.optimalTilingFeatures; + fprops.linearTilingFeatures : fprops.optimalTilingFeatures; basics_primary = (feats_primary & basic_flags) == basic_flags; storage_primary = !!(feats_primary & VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT); @@ -320,8 +323,7 @@ static int vkfmt_from_pixfmt2(AVHWDeviceContext *dev_ctx, enum AVPixelFormat p, vk_formats_list[i].fallback[0], &prop); feats_secondary = tiling == VK_IMAGE_TILING_LINEAR ? - prop.formatProperties.linearTilingFeatures : - prop.formatProperties.optimalTilingFeatures; + fprops.linearTilingFeatures : fprops.optimalTilingFeatures; basics_secondary = (feats_secondary & basic_flags) == basic_flags; storage_secondary = !!(feats_secondary & VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT); } else {