diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2020-10-15 12:04:10 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-10-15 12:29:42 +0200 |
commit | 148ad49c939f2413532ebecf92b60ce8dbc8cb8b (patch) | |
tree | 304312bd872998f9f65ed86d416440bb0c01f378 /COPYRIGHT.txt | |
parent | b84f9b00681526afe39484129672e21917659084 (diff) |
vulkan: Sync loader, headers and glslang to sdk-1.2.154.0
Actually sdk-1.2.154.1 for Vulkan-Loader.
glslang is updated to bacaef3237c515e40d1a24722be48c0a0b30f75f which is the
known-good version for Vulkan-ValidationLayers 1.2.154.0.
COPYRIGHT.txt was synced with the current version of the glslang LICENSE.txt,
and `glslang/register_types.cpp` now uses the upstream definition for its
default builtin resource instead of hardcoding it.
Diffstat (limited to 'COPYRIGHT.txt')
-rw-r--r-- | COPYRIGHT.txt | 104 |
1 files changed, 70 insertions, 34 deletions
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt index 6122452b88..31f51c2854 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -164,7 +164,8 @@ License: FTL Files: ./thirdparty/glslang/ Comment: glslang -Copyright: 2015-2018 Google, Inc. +Copyright: 2015-2020 Google, Inc. + 2014-2020, The Khronos Group Inc 2002, NVIDIA Corporation. License: glslang @@ -350,10 +351,10 @@ License: BSD-3-clause Files: ./thirdparty/vulkan/ Comment: Vulkan Ecosystem Components (Vulkan ICD loader and headers) -Copyright: 2014-2019, The Khronos Group Inc. - 2014-2019, Valve Corporation - 2014-2019, LunarG, Inc. - 2015-2019, Google Inc. +Copyright: 2014-2020, The Khronos Group Inc. + 2014-2020, Valve Corporation + 2014-2020, LunarG, Inc. + 2015-2020, Google Inc. License: Apache-2.0 Files: ./thirdparty/vulkan/vk_mem_alloc.h @@ -872,8 +873,8 @@ License: Expat License: glslang Here, glslang proper means core GLSL parsing, HLSL parsing, and SPIR-V code - generation. Glslang proper requires use of two licenses, one that covers - non-preprocessing and an additional one that covers preprocessing. + generation. Glslang proper requires use of a number of licenses, one that covers + preprocessing and others that covers non-preprocessing. . Bison was removed long ago. You can build glslang from the source grammar, using tools of your choice, without using bison or any bison files. @@ -896,43 +897,78 @@ License: glslang . The core of glslang-proper, minus the preprocessor is licenced as follows: . + -------------------------------------------------------------------------------- + 3-Clause BSD License + -------------------------------------------------------------------------------- + . Copyright (C) 2015-2018 Google, Inc. Copyright (C) <various other dates and companies> . All rights reserved. . - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: + See: <License: BSD-3-clause>. . - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. + -------------------------------------------------------------------------------- + 2-Clause BSD License + -------------------------------------------------------------------------------- + . + Copyright 2020 The Khronos Group Inc + . + See: <License: BSD-2-clause>. + . + -------------------------------------------------------------------------------- + The MIT License + -------------------------------------------------------------------------------- + . + Copyright 2020 The Khronos Group Inc . - 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. - . - Neither the name of 3Dlabs Inc. Ltd. nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - . - 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 HOLDERS 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. + See: <License: Expat>. . -------------------------------------------------------------------------------- + APACHE LICENSE, VERSION 2.0 + -------------------------------------------------------------------------------- + . + See: <License: Apache-2.0>. + . + -------------------------------------------------------------------------------- + GPL 3 with special bison exception + -------------------------------------------------------------------------------- + . + Bison implementation for Yacc-like parsers in C + . + Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc. + . + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + . + As a special exception, you may create a larger work that contains + part or all of the Bison parser skeleton and distribute that work + under terms of your choice, so long as that work isn't itself a + parser generator using the skeleton or a modified version thereof + as a parser skeleton. Alternatively, if you modify or redistribute + the parser skeleton itself, you may (at your option) remove this + special exception, which will cause the skeleton and the resulting + Bison output files to be licensed under the GNU General Public + License without this special exception. + . + This special exception was added by the Free Software Foundation in + version 2.2 of Bison. + . + -------------------------------------------------------------------------------- + ================================================================================ + -------------------------------------------------------------------------------- . - The preprocessor has the core license stated above, plus an additional licence: + The preprocessor has the core licenses stated above, plus an additional licence: . Copyright (c) 2002, NVIDIA Corporation. . |