From patchwork Fri Feb 12 15:58:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Oliver X-Patchwork-Id: 25599 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 5E4AD44ABB8 for ; Fri, 12 Feb 2021 18:27:57 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 32B5A68A83C; Fri, 12 Feb 2021 18:27:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f173.google.com (mail-oi1-f173.google.com [209.85.167.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 757F368A33F for ; Fri, 12 Feb 2021 18:27:50 +0200 (EET) Received: by mail-oi1-f173.google.com with SMTP id m7so154399oiw.12 for ; Fri, 12 Feb 2021 08:27:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=5mpupqNcx0vf7ko/IAEvbY4oPuoAaUBzwcKzqWzoxP4=; b=moh428pw2BU4exJxDe86jZcEXLVfLqPhoFRRyOSLgv1+1ikIqCCQcXDFbOlI3ea2iM hLXPQr5b71qEBF1D5qd/NYOjMHpQSPvuLld+mThA/QKXqd1jZ/BNvvg0914K/b34lZyo hsOH3WWJgwpCDhooROf102UqvYxVxogcN18KVNyeUzwJDj88M7hM3NI2/A9R1ZgdqpIq C53OMCc1mBkcWmJpK7p1e/SNl2OPFAH66g3vR97ydv0B5lIr7185+KQda8LW04kg5VT1 KwnJqbWnn0IRa6RtiHd9d7U6Ypo4AI8amEOZ8TMvZbY6zCzbxQBquGx3nu3+lDB7YSwZ ubhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=5mpupqNcx0vf7ko/IAEvbY4oPuoAaUBzwcKzqWzoxP4=; b=Z2VyvKni7iDTc05J4WLySqrbCN0kJ9AvZUX6+dud2UjyAH2GiWWjQ5TI6AHCrpColO tfVmVyuhQew9v1x9sNaglc1fdP5tj1Eiu02ugWv8uMNs2VG6FPGd6rACq7HrOf2lLuwY ZfR+G+A2KODbZe4DgX+iJn8ySuEhr233ACqdFl6TCmRGohAo4MgyWGgaKj8u057N5HOn 7P/vcNH0dM0Wa9x8it/VcfxgkMd4HCwlY6lxWdR/Ce8pN7l3pWPreV+hCqWWnlkThCe/ +Dek1XTpOmjW4U41wrX2yDG7hhzBLp1q1XUa6K0NkiGIk6NsjDTSBoEyApIS942dThmG He7w== X-Gm-Message-State: AOAM530AH2IDHSE1i/XQUb0QvFlJfYlvO0MW81pILqI8Xq1u241WYD4C d3i/uHike7xH0AyHqnFo04mvMD/Xz3Z3QAju5X+QRAIq0SxX9A== X-Google-Smtp-Source: ABdhPJy2m+h5J3aW2J76u5dKkeW9P1IioixabmDjztuLszdokJjNqjQjfdOL+svkhKHTTsaDiG6VFVJjaNORhsIcv6g= X-Received: by 2002:a17:90b:4a89:: with SMTP id lp9mr3310231pjb.170.1613145517450; Fri, 12 Feb 2021 07:58:37 -0800 (PST) MIME-Version: 1.0 From: Matt Oliver Date: Sat, 13 Feb 2021 02:58:25 +1100 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH 1/2] cuda_runtime.h: Correct ushort4 to use ushort. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" --- compat/cuda/cuda_runtime.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compat/cuda/cuda_runtime.h b/compat/cuda/cuda_runtime.h index 0bf3de85d3..c5450b2542 100644 --- a/compat/cuda/cuda_runtime.h +++ b/compat/cuda/cuda_runtime.h @@ -73,7 +73,7 @@ typedef struct __device_builtin__ __align__(4) uchar4 typedef struct __device_builtin__ __align__(8) ushort4 { - unsigned char x, y, z, w; + unsigned short x, y, z, w; } ushort4; typedef struct __device_builtin__ __align__(16) int4 From patchwork Fri Feb 12 15:59:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Oliver X-Patchwork-Id: 25597 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 52D0444A2A7 for ; Fri, 12 Feb 2021 18:06:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1B2B068A920; Fri, 12 Feb 2021 18:06:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f171.google.com (mail-oi1-f171.google.com [209.85.167.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A4DB1689FD6 for ; Fri, 12 Feb 2021 18:06:33 +0200 (EET) Received: by mail-oi1-f171.google.com with SMTP id d20so90701oiw.10 for ; Fri, 12 Feb 2021 08:06:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=ghSpoblGc2YW0b+6g5IZ6ayG1quch0mLPXhS6XHqFMc=; b=Hu8aJON6ipG8cvw+KOpAp734fVqCFtfxmRp/3HDUiL6tEFGBeiuUYF3+/3WG2jX2VS LnGNSPtX67VhXd4k3/yUt5XpWrTgYxI9orXl6VH//3wdTNf2HzPRzh1news2dPruwNrO 9vq/ug20+cb1ohCVdFAEH3Bo3ppCVOt7NyM8srIo7EwNmM7pK358nWGqJk6H23fMbkmB DKx5N5fxhMB6x4cxmNeEQLDNpGC0+2CgqGLchGsE9oLP1vNilgcM4yZfjWucQsHNHz4R niw5JJOULxF2v0iN7d+pp5MBVkTSQ/3P0bHB64Kybs/Altr/6/MBVULkCoinbRQM8iEH SXHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=ghSpoblGc2YW0b+6g5IZ6ayG1quch0mLPXhS6XHqFMc=; b=p9y6hb3pkB4HJCKiKSr+Rp9f8xwgJZwseryci6f41l7f1hzMAkrhnLidrWO4F0QVzf qtwtz6Txh6ViNEr/mHZZ+l0Eb9PGwXRhuCkr8lbbnjZ7qjtcTXfM9x9sjd/HGIeDrPkt D/Ltr6U0WOXUAlGbLtJGgYFfbOEKFO3Lu0bCfT9vD4CXmf3mXcsrMbmiJkctvaWrxCAd BCZfZac1ge4Yh4LVY+qHrleRlE0p6jw55nMJsnjS3rDSqeZ0ELSuJkpSjD+PMC0T4ogJ ei09zjsNbIDfCW9Mpoj7u6ooJwDKw/788UBMefMhCTc8xer2SmGR8s46v6R5gfMeMAkV +l+Q== X-Gm-Message-State: AOAM530Rh8ee31xo8Fa6HYy9lCFnOGu6g78f2ARJR17hUKXiYV7oX5ZH umCoYsq7JS+55PjkaQV4TPTwisQLg5PuIaz+5wzXOxtzMFMbOQ== X-Google-Smtp-Source: ABdhPJxrwFZgL2VXRW8hzzEhdy/BUtMVK81qfe6SW7qJ1+ZaFvEY1p7ildCc/uhmtlEwVIW90ycFiTre4JCrd1zODpg= X-Received: by 2002:a17:90a:ad81:: with SMTP id s1mr3294544pjq.9.1613145593772; Fri, 12 Feb 2021 07:59:53 -0800 (PST) MIME-Version: 1.0 From: Matt Oliver Date: Sat, 13 Feb 2021 02:59:42 +1100 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH 2/2] configure: Use no-narrowing for cuda_llvm compilation. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" This fixes llvm compiler generating errors about narrowing conversion with recent releases. --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index df298b4b9b..e716f6f932 100755 --- a/configure +++ b/configure @@ -6242,7 +6242,7 @@ fi if enabled cuda_nvcc; then nvccflags="$nvccflags -ptx" else - nvccflags="$nvccflags -S -nocudalib -nocudainc --cuda-device-only -include ${source_link}/compat/cuda/cuda_runtime.h" + nvccflags="$nvccflags -S -nocudalib -nocudainc --cuda-device-only -Wno-c++11-narrowing -include ${source_link}/compat/cuda/cuda_runtime.h" check_nvcc cuda_llvm fi