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 83883450B5 for ; Sun, 5 Feb 2023 05:38:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2CB9B68BEB4; Sun, 5 Feb 2023 07:38:07 +0200 (EET) Received: from w4.tutanota.de (w4.tutanota.de [81.3.6.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 12B9268BA11 for ; Sun, 5 Feb 2023 07:38:01 +0200 (EET) Received: from tutadb.w10.tutanota.de (unknown [192.168.1.10]) by w4.tutanota.de (Postfix) with ESMTP id 75D69106014E for ; Sun, 5 Feb 2023 05:38:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1675575480; s=s1; d=lynne.ee; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Content-Transfer-Encoding:Cc:Date:Date:In-Reply-To:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:References:Sender; bh=7MFg2gM1QgRtVEbCmIbt/lyeV9DXEkJH/GbEFzAK3nA=; b=PBYvY813WwxdUigP0DZSG0v1DCvBRAn3qHV0l9ohnT97PnHn2a7/Xh3PBsdKjr95 2hX0bj1jALem79WxnDNsgD+cqciiTchllz4Pf9O7SkJ/RF1uCuQi+tu4OFw/1BfNo6Y Exj3B75+IvzIXpoCnucMIyLxh89C5jhOiaDKjGoIeDN/tA+gtjQfi8ULIxG9UHePuXG Wc1slgYDKljeCV5Vi6q0OCfDnL1L2tNmxwaJHs/m15J4ja4YVjeZbTK3Fg2v4r8W161 x0DMpQSAIfvKPbgLlRC0VhAZmNKsNUHoiCF0O4YbvzqiXJ6ApfT0GdL/DHc7HQJZwsx /oSHF8qCcw== Date: Sun, 5 Feb 2023 06:38:00 +0100 (CET) From: Lynne To: FFmpeg development discussions and patches Message-ID: In-Reply-To: <20230204231703.9050-3-rcombs@rcombs.me> References: <20230204231703.9050-1-rcombs@rcombs.me> <20230204231703.9050-3-rcombs@rcombs.me> MIME-Version: 1.0 Subject: Re: [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: 5 Feb 2023, 00:17 by rcombs@rcombs.me: > 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 > I've fixed this and a few other issues in my vulkan branch. Could this wait a little longer until it's merged? _______________________________________________ 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".