From patchwork Sat Feb 4 23:17:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 40285 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp2234532pzk; Sat, 4 Feb 2023 15:17:44 -0800 (PST) X-Google-Smtp-Source: AK7set8etOdjLI3JQ9gtGa8CY2UboDuekIhX6Xvfznn42DXCnbIIqBGBbRkxxW4xwSe05O2ZVb/c X-Received: by 2002:a17:906:b812:b0:88c:7a36:d11e with SMTP id dv18-20020a170906b81200b0088c7a36d11emr13564817ejb.25.1675552664776; Sat, 04 Feb 2023 15:17:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675552664; cv=none; d=google.com; s=arc-20160816; b=acZp1G1qFZAOLy1fBUU7zeEeshw0eLWqICE8R/r4L23YtI2QfN+4p8NTVfyUVOdUHh mbCfxNyAiGRr4/AthdS8oRgxo2r7uNVuUhK4CcFpqUHfXeEQV4/0EISgPvbU5d2g15m9 12vu5MnPYWe2ideD+/dXI5LrrI/vh4zyu0PycJmTGY1oYwGjha+cr6IVFug9s0whREJ4 5iwZTHqwfMuUPd5cKv8YBPsiymrQ7+0XfoXoeIYnWmQrcyALmtqg5SHgKUDQAHBIHOUI Dwa+ECY0hrVF9xa0Jfg25+6PTGbnp9bYk5Wt7Rmjbbp3HyIzm9tV/6xyYftY6c8d4Z6B B2NQ== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=PuSry/3dKap7c0zzktpKmDf3HIELax9N3n8AYASrUHw=; b=aLhb23mXFQIq6I+llMkq8IlR/KtUierz7f0NkCwY5M/QCT+MW59pijm9mAt7U4rXdE vOXtxsqDva61Yna+RuOz9DaoxbIUYPPP1AGmTi9LYi9dzx9eEipyQBJqTIpKw+odpWpo 0k+SGPrAiaugJmNAZXs0UAVCz4iATGENnzDPquZSwYMfE3H/UZ3mgPDpbzle7X4cuiFR im8yhf+v0WCD2vhpY336y/lFhK8HzDVQV0g4sL2yhZAuvvwwE8cj1qM+zrILZlua76ca aymhd1TQ/XJRt9XGTrRsePfXDnfUpYf8utq7HYtalUz0wY3+zOn9+HquZmE3U2YDRHGs +PFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=Vx0DQw7C; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r3-20020aa7d583000000b004a25f9d0900si6787132edq.27.2023.02.04.15.17.44; Sat, 04 Feb 2023 15:17:44 -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=@rcombs.me header.s=google header.b=Vx0DQw7C; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 46EB168BE8C; Sun, 5 Feb 2023 01:17:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f178.google.com (mail-il1-f178.google.com [209.85.166.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 07A5E68BE0E for ; Sun, 5 Feb 2023 01:17:17 +0200 (EET) Received: by mail-il1-f178.google.com with SMTP id k17so735688ilq.12 for ; Sat, 04 Feb 2023 15:17:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=GMCbhjv0t0rpgm8nVhKsBDUt/EuH/3jCf86fh6xO8yg=; b=Vx0DQw7CPr1U5GReTznQkGciKgWDNQwmOmF1PGZAzXfzZBNgR0UUfEtUFWm8SxxEtB f7jNSqexZee5BS5Ba8RfAYsxs3P+ipsTkDjGEpRh40UZ6TmEd1ld5zLtjLdG7+Zm84ig 6DBb2bfhYj4S76nflrm6i84zAmcKW/joBGEF9N1U6P9UnSJiUayEN1Wl3+FIckmDtnIU JKnvAzJp090DYkx6HB3LWdeB3MNOWtplAq9mvKuYvTIfPrsuo5xy82ejth9Dw+XmzcY/ D/zbk3fkqz6VWOCmexuYJ0cbI4gg5fBTyCHPyY1tHb84XTL4S3+PxcleR7Br3MmIxZ5h Ii2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GMCbhjv0t0rpgm8nVhKsBDUt/EuH/3jCf86fh6xO8yg=; b=2lnStwAARiuGvrEZnwlVvh4AbjRMDkmSCgRShnJb/7S2cExjvI5lYAibsvveEbMp6X LETZuSJTVt9e9LXm6zqJ0PiGLRrx9mt3Jf2MmHj6dBUNRayrKPoBCVmQvGlNMTSt4Wti ESo8MdqMQbl15079Q4IP/D4pZ1w1owgtt17QJws8VvkPNRf1GLktDTu9r/lnlXCC/kcM AxsXl/NTY6HleTbmF8VrGFsgHYc35F/Bm0/wYDho4nt3AwDNEUVOZ9XKIXTQjG7WglEL uO1FfPd7vHLuqmBEJYt1RZdMNbyiyzXDl4sAFBGyab6eMbqA9CosoYRCoZxsUY/EgJCn ZaWg== X-Gm-Message-State: AO0yUKVs3V02DZCvUWD0SLldgMiOKDbMq1CjEPYvsVc9tVSsjqDfZq5U sI0fJ9Iwoq4kUrXFBkEDNaS6AfGtNY53HJ83XA== X-Received: by 2002:a92:cd89:0:b0:311:1137:178d with SMTP id r9-20020a92cd89000000b003111137178dmr11358409ilb.13.1675552635274; Sat, 04 Feb 2023 15:17:15 -0800 (PST) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:ac6c:b24e:29cb:25de]) by smtp.gmail.com with ESMTPSA id bo14-20020a056638438e00b0039e8c12414asm2115705jab.164.2023.02.04.15.17.14 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 04 Feb 2023 15:17:14 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Feb 2023 17:17:03 -0600 Message-Id: <20230204231703.9050-3-rcombs@rcombs.me> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230204231703.9050-1-rcombs@rcombs.me> References: <20230204231703.9050-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] lavu/vulkan: only request beta extensions if we detected they're present 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: Q9iRh/y3pzVq Fixes build on systems where vulkan_beta.h is absent (e.g. Android) --- libavutil/hwcontext_vulkan.c | 5 ++++- libavutil/vulkan_functions.h | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 589a7a7d9a..67802a850d 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -16,8 +16,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" + #define VK_NO_PROTOTYPES +#if HAVE_VULKAN_BETA #define VK_ENABLE_BETA_EXTENSIONS +#endif #ifdef _WIN32 #include /* Included to prevent conflicts with CreateSemaphore */ @@ -29,7 +33,6 @@ #include -#include "config.h" #include "pixdesc.h" #include "avstring.h" #include "imgutils.h" diff --git a/libavutil/vulkan_functions.h b/libavutil/vulkan_functions.h index d15a5d9a42..4d80322540 100644 --- a/libavutil/vulkan_functions.h +++ b/libavutil/vulkan_functions.h @@ -19,8 +19,12 @@ #ifndef AVUTIL_VULKAN_FUNCTIONS_H #define AVUTIL_VULKAN_FUNCTIONS_H +#include "config.h" + #define VK_NO_PROTOTYPES +#if HAVE_VULKAN_BETA #define VK_ENABLE_BETA_EXTENSIONS +#endif #include "hwcontext.h" #include "hwcontext_vulkan.h"