From patchwork Sun Mar 5 21:39:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 40587 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp2430774pzb; Sun, 5 Mar 2023 13:39:16 -0800 (PST) X-Google-Smtp-Source: AK7set+VlF8CFxLHSbfGETTQ8NMGhTYA8IIZQdaGe9ayWiVev8+Wt0BF1mdOY0IZzA9z4pOzXX/S X-Received: by 2002:aa7:c552:0:b0:4cf:350e:3459 with SMTP id s18-20020aa7c552000000b004cf350e3459mr6998197edr.25.1678052355912; Sun, 05 Mar 2023 13:39:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678052355; cv=none; d=google.com; s=arc-20160816; b=QMAktFr6qGGT/Dd3X5nDatD2kJ/Q/g2NpnK3DmKNFBRAdmMrmILICXDT/n0ygoH+eE 0NNw1OdPHGctDke+TvlcHB5Ssg0m6tnknRR7Fucbb0WciA4mu5bxVqtZElhop2MxfOA5 t7kEm0RVyuIPcFftg9U+9sdbEk/ksQGO1z6n8LrZZ7Vc/0vJGzYXKUd5NlN6sH/Pp3TH AJqJjxMYLgHcGmX04nLa3JBMmmyjVP2MCsBiKQuI0bddjWYksiawnKyW2CmswPN0uSzP GruMHvz6yUn+dxXedTu0bwKnTcLVOrZcgvrXXQAAnLWRrqL+C5tOhnlTrkYRzNpJdw/L UrGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=CGGs/Z0BKZxqZBiQ1/k7SOTaEYdxkV0Ba1e3G46QBeQ=; b=kYCMa40XpNL3v66LCZmp0T86z61eoF6/kkbhax+SpF6S4N9cfdCb760y7J5cj7TbI7 CQO8PuSpB+Mnj4wQV7C+hl8P7gRf/VOxn5Y6tRMclyV62wuSpHholElw8purX1q5E7QB vxFbT4JyH+6EuIu2U7ggOfBaCpNKhUEZ+j2S+enWg60nhRMrpOI9rYnRzmvK7GWU7ysC Lhp5Qx03QJsHrL+kRpyUz3zdlW2vUzj4VvaHUoG4b02PeCGbR5hcgYf+ilFroNn1yRQT mbg/zEWcBvCgLzy9+e4PLlActWXgEnRUqqCiS4n6xj52irhnK+dHFyjlZeXRvUhAlL6e 13LQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=sis89dt6; 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 x19-20020aa7d393000000b004c02164556esi9244422edq.77.2023.03.05.13.39.14; Sun, 05 Mar 2023 13:39:15 -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=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=sis89dt6; 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 4263368B9CA; Sun, 5 Mar 2023 23:39:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8643E68A661 for ; Sun, 5 Mar 2023 23:39:05 +0200 (EET) Received: by mail-lf1-f41.google.com with SMTP id s20so10251402lfb.11 for ; Sun, 05 Mar 2023 13:39:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20210112.gappssmtp.com; s=20210112; t=1678052344; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=85I460g8ZUpIS2oplVLgrH2LKRRSvCM8kAOyzIXE3kc=; b=sis89dt6FB/yXc1IvpG+AjbuptEMBFNXRe8eSkakRWSSX+o98p9S9iSXmIgBcLpcyC eZly9hHd9/3old+FzStGAjpGSgGyddByLw/ThANeW0nJGms0xSiUSMNB+2gfVIxkhpI4 HBmkVTZnU7THtEjKuSbpX1lXKBmz7ZCwgV1TihEYGpV01w3A5zhm3ncqNt8rnWoXilZz dEy+t/8tOKQ8X1Or8kY2pSRDRoCEnw/euJjuep8IISucWCrcFHnN4J4VrecD3j6PeNWd FAjjd/wo7o3pIReaYA5lmT2ojYBo+1utupzkZKE8wCqKFULQIyRHVlc1MJW7gh5G54If VDzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678052344; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=85I460g8ZUpIS2oplVLgrH2LKRRSvCM8kAOyzIXE3kc=; b=72KgrA4Gm/ILIofFbr+favSt72g1pXnCl6euISI/Bol8T1URrSKRMNNw9nFQ6PFPFp PSfRTaig5TWZv1WDgnaO0XgTH/5ATWffnN22tqrCbOkaQQ735pefB8fhZHAV9Clt8Dka AOEkeG5CBLP+o2qYo+imXTZIOETZCK24RPo08ghh3l3haPKB7ZmPNrztWw2YB7P6OR0o Vzr7A/KqaKv7HrOtnTMhRbrCWij92gGrw/le90AnrxGZH6jU1LstDoJVy/K7zN9vwLbu IQysnskVjxKDehCUXMVy6QecYAe4WZLw8UiKm2dKEb109+IjijScMC3lcm96vSHs1ChK X0vw== X-Gm-Message-State: AO0yUKVaFgnOSa9nRyD7lits0wizxxMeMpIHw+KCHOZsmwWu0tY0NQqg C/5E/Cj0qel1bAHU4HLPlu3OewQVb0fjNghEoEsKJQ== X-Received: by 2002:ac2:4949:0:b0:4d5:831e:3154 with SMTP id o9-20020ac24949000000b004d5831e3154mr2451767lfi.45.1678052344389; Sun, 05 Mar 2023 13:39:04 -0800 (PST) Received: from localhost.localdomain (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id e11-20020ac2546b000000b004b564e1a4e0sm1335151lfn.76.2023.03.05.13.39.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Mar 2023 13:39:03 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Mar 2023 23:39:03 +0200 Message-Id: <20230305213903.2647506-1-martin@martin.st> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] vulkan: Fix win/i386 calling convention and pointer/int conversion error 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: =?utf-8?q?Martin_Storsj=C3=B6?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2/AJZe8uMYEn This fixes the following two errors when compiling with a modern version of Clang for Windows/i386: src/libavutil/hwcontext_vulkan.c:738:32: error: incompatible function pointer types initializing 'PFN_vkDebugUtilsMessengerCallbackEXT' (aka 'unsigned int (*)(enum VkDebugUtilsMessageSeverityFlagBitsEXT, unsigned int, const struct VkDebugUtilsMessengerCallbackDataEXT *, void *) __attribute__((stdcall))') with an expression of type 'VkBool32 (VkDebugUtilsMessageSeverityFlagBitsEXT, VkDebugUtilsMessageTypeFlagsEXT, const VkDebugUtilsMessengerCallbackDataEXT *, void *)' (aka 'unsigned int (enum VkDebugUtilsMessageSeverityFlagBitsEXT, unsigned int, const struct VkDebugUtilsMessengerCallbackDataEXT *, void *)') [-Wincompatible-function-pointer-types] .pfnUserCallback = vk_dbg_callback, ^~~~~~~~~~~~~~~ src/libavutil/hwcontext_vulkan.c:1152:15: error: incompatible pointer to integer conversion assigning to 'VkCommandPool' (aka 'unsigned long long') from 'void *' [-Wint-conversion] cmd->pool = NULL; ^ ~~~~ 2 errors generated. The calling convention mismatch is an issue only on Windows/i386, while the latter is a hard error by default in modern Clang whenever pointers are smaller than unsigned long long. Signed-off-by: Martin Storsjö --- libavutil/hwcontext_vulkan.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 2a9b5f4aac..2ae469283d 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -401,10 +401,10 @@ static const char *vk_ret2str(VkResult res) #undef CASE } -static VkBool32 vk_dbg_callback(VkDebugUtilsMessageSeverityFlagBitsEXT severity, - VkDebugUtilsMessageTypeFlagsEXT messageType, - const VkDebugUtilsMessengerCallbackDataEXT *data, - void *priv) +static VkBool32 VKAPI_CALL vk_dbg_callback(VkDebugUtilsMessageSeverityFlagBitsEXT severity, + VkDebugUtilsMessageTypeFlagsEXT messageType, + const VkDebugUtilsMessengerCallbackDataEXT *data, + void *priv) { int l; AVHWDeviceContext *ctx = priv; @@ -1149,7 +1149,7 @@ static void free_exec_ctx(AVHWFramesContext *hwfc, VulkanExecCtx *cmd) av_freep(&cmd->queues); av_freep(&cmd->bufs); - cmd->pool = NULL; + cmd->pool = 0; } static VkCommandBuffer get_buf_exec_ctx(AVHWFramesContext *hwfc, VulkanExecCtx *cmd)