From patchwork Mon Jun 28 15:16:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 12727 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 D4AD7C3220 for ; Mon, 28 Jun 2021 15:16:30 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 51968684D4; Mon, 28 Jun 2021 17:16:30 +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="a/tY09CI"; dkim-atps=neutral Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id EC9036028C for ; Mon, 28 Jun 2021 17:16:28 +0200 (CEST) Received: by mail-lj1-x234.google.com with SMTP id h6so10004362ljl.8 for ; Mon, 28 Jun 2021 08:16:28 -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:mime-version :content-transfer-encoding; bh=NazBYd4EZjbvJn94yLP6xj6bDUhx63PQcbFb/CYa/80=; b=a/tY09CI9JTyZKh8TTVwP537sciUdZRoJ/GMtM4oJuitWqJvRnFA/iZRqmO7kPHzgs taYAJv29tUM3jYVTydsd2EHXiVQirA3240qgjUagPuN0TJb9T04a0fW1/Y6GWXyIuG5g OfYmFzXzJw2Ge+tJa6TlJ8nX/gkbFKflc1TxdCuZv+98LMv45u0Et3F3DOOVO41x/Iai P6uf0S5MtFoAG1sR+98evEnVJxV5VRaPw1VBSt1Wyvu8abawq0phDy0dl3skNDHCh8H/ gkKvpdVmmxz3TQEtVyF6H1LBDAcp085WYaRptX6w+zIxOAAh6rvazEi5lNVLq3V5azch UHAw== 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:mime-version :content-transfer-encoding; bh=NazBYd4EZjbvJn94yLP6xj6bDUhx63PQcbFb/CYa/80=; b=FeYgLdZff1Bmt7/BxmFGHf3+dYRHHnQKXKRTEgt+rbzSsusYP57vVXxzut9Bm0EMQJ /TQpyca4472oAeCIiF48eAwZ6+W8BorwYz2CpJgWM0Fm+DKGiFj+E88l0ugtosVGKJNK DTbwAMSIrggRCSD00PO2Cl7PcpAX9fnNhMaFM5O+HtHkqSQ5Ij1N/Vuwp8y8OuzSpJJs 0Um4+izNyuzvhGbgWrg6l2Xt/qo715dUn3mC+Kk0/PEq3kEXizGKGN5IjMt5OBh8hl1C nKVlt++KbyJ5d3gJYwxHm5dABfupbHoYyeza+x99qfnilV2SJ3onIo7peY0/1/84ta8D YcEw== X-Gm-Message-State: AOAM532h0mkIDmYwLiNEw54bi/tDF9LOGZWZihgdh7ZQO2hhQr5ZXR6h V15EMjSfWVPFeFBtUKrWEl1eFu030q0JMg== X-Google-Smtp-Source: ABdhPJz/9odXPOQLAkX20pB235aYVhAyUaSFTYLVzHzyP9Sum/GUU45IoWu8xrcaFGariLPP0HqmTA== X-Received: by 2002:a2e:b179:: with SMTP id a25mr20482450ljm.151.1624893388300; Mon, 28 Jun 2021 08:16:28 -0700 (PDT) Received: from localhost.localdomain ([85.249.44.185]) by smtp.googlemail.com with ESMTPSA id n6sm1341092lfi.2.2021.06.28.08.16.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jun 2021 08:16:27 -0700 (PDT) From: Andrey Konovalov To: libcamera-devel@lists.libcamera.org, laurent.pinchart@ideasonboard.com, paul.elder@ideasonboard.com Date: Mon, 28 Jun 2021 18:16:12 +0300 Message-Id: <20210628151612.4474-1-andrey.konovalov@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v5.1 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" bayer_8.* vertex and fragment shaders carry the copy of the 2-Clause BSD License. Replace it with the SPDX-License-Identifier. Signed-off-by: Andrey Konovalov Reviewed-by: Paul Elder Reviewed-by: Laurent Pinchart --- 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