From 90f4fd76e21fea1c6556f98038b1ae3bca4b8177 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Fri, 13 Mar 2015 15:27:28 +0100 Subject: Remove copyright headers from the ES3-specific shadow map shaders Not having the headers is fine since the built-in shaders do not have them either, neither in Quick nor in Qt3D. The main issue with ES is that in ESSL3 the spec states that the version directive is only allowed in the first line and no comments are allowed before. This is not true for standard GLSL where the spec states the comments and whitespace are allowed before. Mesa does not seem to enforce this, but we have already found at least one GL ES 3.0 implementation which does. Change-Id: I6ac3f949eeb44a005f69cc03f7d6f6eb5b577f2e Reviewed-by: Sean Harmer --- examples/qt3d/shadow-map-qml/shaders/es3/ads.frag | 36 ---------------------- examples/qt3d/shadow-map-qml/shaders/es3/ads.vert | 36 ---------------------- .../qt3d/shadow-map-qml/shaders/es3/shadowmap.frag | 36 ---------------------- .../qt3d/shadow-map-qml/shaders/es3/shadowmap.vert | 36 ---------------------- 4 files changed, 144 deletions(-) (limited to 'examples/qt3d') diff --git a/examples/qt3d/shadow-map-qml/shaders/es3/ads.frag b/examples/qt3d/shadow-map-qml/shaders/es3/ads.frag index 30977cf1e..2074f0274 100644 --- a/examples/qt3d/shadow-map-qml/shaders/es3/ads.frag +++ b/examples/qt3d/shadow-map-qml/shaders/es3/ads.frag @@ -1,39 +1,3 @@ -/**************************************************************************** -** -** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - #version 300 es precision highp float; diff --git a/examples/qt3d/shadow-map-qml/shaders/es3/ads.vert b/examples/qt3d/shadow-map-qml/shaders/es3/ads.vert index c304fbaad..9c16eb07d 100644 --- a/examples/qt3d/shadow-map-qml/shaders/es3/ads.vert +++ b/examples/qt3d/shadow-map-qml/shaders/es3/ads.vert @@ -1,39 +1,3 @@ -/**************************************************************************** -** -** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - #version 300 es in vec3 vertexPosition; diff --git a/examples/qt3d/shadow-map-qml/shaders/es3/shadowmap.frag b/examples/qt3d/shadow-map-qml/shaders/es3/shadowmap.frag index 22fe0431b..93ced265c 100644 --- a/examples/qt3d/shadow-map-qml/shaders/es3/shadowmap.frag +++ b/examples/qt3d/shadow-map-qml/shaders/es3/shadowmap.frag @@ -1,39 +1,3 @@ -/**************************************************************************** -** -** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - #version 300 es precision highp float; diff --git a/examples/qt3d/shadow-map-qml/shaders/es3/shadowmap.vert b/examples/qt3d/shadow-map-qml/shaders/es3/shadowmap.vert index 1fe6b3724..4745c7214 100644 --- a/examples/qt3d/shadow-map-qml/shaders/es3/shadowmap.vert +++ b/examples/qt3d/shadow-map-qml/shaders/es3/shadowmap.vert @@ -1,39 +1,3 @@ -/**************************************************************************** -** -** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - #version 300 es in vec3 vertexPosition; -- cgit v1.2.3