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 3C83A429C0 for ; Sat, 4 Feb 2023 23:17:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 17D9568BDF0; Sun, 5 Feb 2023 01:17:24 +0200 (EET) 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-Google-Smtp-Source: AK7set+Y7xLCE2A7W5B9+gYLT50LNtLSXjzGGAsU34HB66fPQ+Fzhq1L241vKimEUqatVWjNh+O/VQ== 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 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: 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" -- 2.39.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".