From patchwork Thu Mar 2 16:27:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Kacper_Michaj=C5=82ow?= X-Patchwork-Id: 40567 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp4727444pzb; Thu, 2 Mar 2023 08:30:02 -0800 (PST) X-Google-Smtp-Source: AK7set+yZapAzN9AjQ/U3Qz2JfZM6QGtnI2rVLQckV8CLq8SkmOc/8Ubu/sBmPyswm7wlbokzXXE X-Received: by 2002:a17:906:ee8d:b0:909:5e7d:a649 with SMTP id wt13-20020a170906ee8d00b009095e7da649mr1027573ejb.32.1677774509373; Thu, 02 Mar 2023 08:28:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677774509; cv=none; d=google.com; s=arc-20160816; b=xxYKOCOgM+e1xkcT1U/r9/J++Ja/A/iUi6/r8+Lgcqe06BbbDvPqc6enEWym/ADzvi pA7I6X+3hz4kf8tmklarRx/672PRgI9FCVQCv5iuBGyn0LJ1w7UezCE3hiYoIQbInopz loKcfiud0ael1JrmgBA/VVN5SPvU9MYDqp1BzTceKJHOWOGUYbfcbJrDkHq8jk69zZmQ ZrITwn7tCBD3Mf4AI/pSiRyrIYAZScRiT7JEcvI1eKuPItAklxPHNIUw1HIDoCEB9tLJ yT0a4xk/Lz+2c4hwqHKXT1QA0UjlISRktViA7Uipz7t1il1UxuXuzKlDshLtzUD4SWIm gsgA== 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=ATblQTdYQ8FZA9oi1brYdsc0e9xfQvM+iUSpQSbPIKA=; b=ZqBc9ZnSGOV5WaBw1fcKQCjmNWQkZZURbgP/lHYNi9wo2GCZfAQIcU3A5OQ3F0W/8U 2XmClFaPgdJmdDuQQIe8hgZIa4f7Z5L9GMYWSv3nJqmCKcStLdFt/r/awcWK+nEuO6DU kSET6nnim6+JcJQUIzOy3Vvvu059ZE03Be53aMR8mcev+3iHilIvUBdAC8wMYeJhd49R 483TfsxGRzHQEwb7D/AL/YXfIvWKI1SE0PWLAz6NmMWdtEkghOebofhIqErsNj0oz6W0 kYeIZWEYbQ9MC5CNueJ+1t1fk3vZW+bRoXPbW3DgLgnnMz8JCuHCWyh25q7X0Oni2w8E BtEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Q3n57JG8; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n16-20020a170906b31000b008b19eb42527si8718681ejz.267.2023.03.02.08.28.05; Thu, 02 Mar 2023 08:28:29 -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=@gmail.com header.s=20210112 header.b=Q3n57JG8; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9015768B076; Thu, 2 Mar 2023 18:28:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D022968A266 for ; Thu, 2 Mar 2023 18:27:55 +0200 (EET) Received: by mail-lf1-f52.google.com with SMTP id m7so22842713lfj.8 for ; Thu, 02 Mar 2023 08:27:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=gb4bgj1oHCjaPLcsOvkvQFs+IMWNY/f1XFqztLPEt8A=; b=Q3n57JG8sPZkghyWiyZ7NVlzaTbxADCiPXwI7eVA8GY1+QIviOUNoB03GQeYCUrYVG 7/76cdM8kDkhK5yg1ZKVBxu42IVlC9ShvsB1tXcRFUXA9mfySSxFrj6DOO/lXtATmZda 0AZrW0+69XLA98v8cs0zh+cile1n2icz3qcJ7lRAzimmQItHW9dEOpns8xVVCFxR8Umy /MiuxcDTH6VJQ4V6o2WJHfUC0rMomPNczaR5cRnxF0fcCHGXbMBkuMV/4ZmjraJuxRKS sud+OA8W9TYMymWZEGUSk39SFBuc7QATZZ6DmTbO58gvKXsK4RPXOohz4TqZlCf7EZkK PZ6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=gb4bgj1oHCjaPLcsOvkvQFs+IMWNY/f1XFqztLPEt8A=; b=ll4hAlrxq9BpVuIpcqhdeE9v1uV4MMHg6qhnPdVEwZtY+WjfSzeSbpjsavb36kvQAt HiohHjhcUEYkoYlU/6IVdQUE0rPsmZMNo/cQOPgnOxafjB2PhcUZdEdjpxtelhJfd/Xj 8xxsu+Mxmz3CzyPTcz2ujdjlQJJ24Lg3VEaPX2qFVEVhHYtdWrNQiHsv23pjciR4Az8T mcjgpFyPaBdS3HtGAYiTp5/TnWR13erlDhZUCPbdoSDTYjAYpveVXa23bI4RhWeKk4Gg GNt7QpQ1W6nvOdrFbnDM2zrw0VCV/KIdLSgBTkdK7utmIb6qv8wrJHEPkuhCTHRefCL0 PQOQ== X-Gm-Message-State: AO0yUKU9gNpCTNICiIdiX4j/ljAoGeOyppwP5skwDHe4yaH7Smmqat6k p/3SZo3VVvUGpnQDSsNpI7JwzGnRW8s= X-Received: by 2002:ac2:5309:0:b0:4a4:68b9:1a14 with SMTP id c9-20020ac25309000000b004a468b91a14mr2880315lfh.60.1677774474597; Thu, 02 Mar 2023 08:27:54 -0800 (PST) Received: from localhost.localdomain (89-74-109-154.dynamic.chello.pl. [89.74.109.154]) by smtp.gmail.com with ESMTPSA id f18-20020ac24e52000000b004d783b0d310sm2200002lfr.307.2023.03.02.08.27.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 08:27:52 -0800 (PST) From: =?utf-8?q?Kacper_Michaj=C5=82ow?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Mar 2023 17:27:30 +0100 Message-Id: <20230302162730.1281-1-kasper93@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavu/vulkan: fix handle type for 32-bit targets 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?Kacper_Michaj=C5=82ow?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: eSLvg/5uk/Q3 Fixes compilation with clang which errors out on Wint-conversion. Signed-off-by: Kacper Michajłow --- libavutil/hwcontext_vulkan.c | 2 +- libavutil/vulkan.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 2a9b5f4aac..b3eccea7af 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -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 = VK_NULL_HANDLE; } static VkCommandBuffer get_buf_exec_ctx(AVHWFramesContext *hwfc, VulkanExecCtx *cmd) diff --git a/libavutil/vulkan.h b/libavutil/vulkan.h index d1ea1e24fb..90922c6cf3 100644 --- a/libavutil/vulkan.h +++ b/libavutil/vulkan.h @@ -122,7 +122,11 @@ typedef struct FFVulkanPipeline { VkDescriptorSetLayout *desc_layout; VkDescriptorPool desc_pool; VkDescriptorSet *desc_set; +#if VK_USE_64_BIT_PTR_DEFINES == 1 void **desc_staging; +#else + uint64_t *desc_staging; +#endif VkDescriptorSetLayoutBinding **desc_binding; VkDescriptorUpdateTemplate *desc_template; int *desc_set_initialized;