From patchwork Tue Jun 22 13:46:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 12690 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id BEBC5C321B for ; Tue, 22 Jun 2021 13:47:21 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7C4346893F; Tue, 22 Jun 2021 15:47:21 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="jyPp9hSA"; dkim-atps=neutral Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id F1E2B68932 for ; Tue, 22 Jun 2021 15:47:19 +0200 (CEST) Received: by mail-lj1-x233.google.com with SMTP id z22so30198584ljh.8 for ; Tue, 22 Jun 2021 06:47:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AD9bhsFZXTGxwv2ObNbhoFmY7s5fGMRNgZRhCRXwJ6w=; b=jyPp9hSARzMsRglYFDOJHvipHrr1y7ptEZ+5soHbtVIs2ZxozKSuZ0K2QRkMZ67kRH 8U957Di8ihezVmnp0LtExT3xrzuwcZnqiBZCQECyHPPcyA+Koa/i0kKHH8lEN37lqqL5 tAQ2dGkZGcKrOhXOsR5+fvteO14UdHHl7seER90TVk5dAxJgIRsr7xexVamRfXsE6whi u2N5Hd6d33+1QFbYRYMpMs6mq7xat0UInSJmwvVS73GCc3ZdbgdZR+/hgUMB9EbccF1r aNmxgNP7Nf36ReEJcntOBjZgCSm98UpkYen3eepr2hH7WhPgBdz7gN65TSxQk8JuY/Qn 2EKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AD9bhsFZXTGxwv2ObNbhoFmY7s5fGMRNgZRhCRXwJ6w=; b=FcJy2gC5GnSMhr0QSUqjyWm0q7Xcn9OLg2HDYp+YHadSGtwDp+RHK5r1bF9bRu2C7P MkJ1jZflr9zaQXpazX0VCiWWly9bmZ2tL4vvdilEG6IwIeO7hMCCif1+evoRSsDGM56x SHaqTx8X3SQNEjuGBWzysoqB7z0XIisFgbg5CKRre5UuBXvNpMsrMbVL1uKOq8jL0unt jGlOu+Rp/aS6KFpD8EWp7BFEtXkPFnp3T8rxutSj9C8KXSFjW17xrUr5rtFfZGZLJJD7 cR1fwbYIkqwU/+0HV8gTh9Cx91NnEuov24Rxfclux7HvGFfK20jWpkuDd7ray70ffzJT d00A== X-Gm-Message-State: AOAM533n15lgMfF8z/np3TTEF/zN8ZTEroF4uJeVJKwXRekeEK/lYWdq s6RbDQnb5cxsrgdjkfeSxlRo3N9/I2Kjfg== X-Google-Smtp-Source: ABdhPJw6AOuSnotVAmkJdO48RDB41mvUag0oRpGzzZkcK4Tdj7pbiT5ZIKZ0fY261vhMUZIIyr1O2A== X-Received: by 2002:a2e:7103:: with SMTP id m3mr3313972ljc.300.1624369639453; Tue, 22 Jun 2021 06:47:19 -0700 (PDT) Received: from localhost.localdomain ([85.249.44.185]) by smtp.googlemail.com with ESMTPSA id b19sm163125ljo.37.2021.06.22.06.47.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Jun 2021 06:47:18 -0700 (PDT) From: Andrey Konovalov To: libcamera-devel@lists.libcamera.org, laurent.pinchart@ideasonboard.com Date: Tue, 22 Jun 2021 16:46:49 +0300 Message-Id: <20210622134652.1279260-7-andrey.konovalov@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210622134652.1279260-1-andrey.konovalov@linaro.org> References: <20210622134652.1279260-1-andrey.konovalov@linaro.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v5 6/9] qcam: viewfinder_gl: use SPDX-License-Identifier in bayer_8.* shaders X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: morgan@casual-effects.com Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Signed-off-by: Andrey Konovalov --- src/qcam/assets/shader/bayer_8.frag | 25 +------------------------ src/qcam/assets/shader/bayer_8.vert | 25 +------------------------ 2 files changed, 2 insertions(+), 48 deletions(-) diff --git a/src/qcam/assets/shader/bayer_8.frag b/src/qcam/assets/shader/bayer_8.frag index 74a6322f..a7d65e1d 100644 --- a/src/qcam/assets/shader/bayer_8.frag +++ b/src/qcam/assets/shader/bayer_8.frag @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ /* From http://jgt.akpeters.com/papers/McGuire08/ @@ -8,30 +9,6 @@ Morgan McGuire This paper appears in issue Volume 13, Number 4. --------------------------------------------------------- Copyright (c) 2008, Morgan McGuire. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ //Pixel Shader diff --git a/src/qcam/assets/shader/bayer_8.vert b/src/qcam/assets/shader/bayer_8.vert index 3354860f..347c15f7 100644 --- a/src/qcam/assets/shader/bayer_8.vert +++ b/src/qcam/assets/shader/bayer_8.vert @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ /* From http://jgt.akpeters.com/papers/McGuire08/ @@ -8,30 +9,6 @@ Morgan McGuire This paper appears in issue Volume 13, Number 4. --------------------------------------------------------- Copyright (c) 2008, Morgan McGuire. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ //Vertex Shader