From 2ceca64004c62cae33ecf462efd5e3166246dfb2 Mon Sep 17 00:00:00 2001 From: Jon Leech Date: Sat, 8 May 2021 01:24:34 -0700 Subject: [PATCH] Add missing copyright headers. --- .clang-format | 3 +++ .gitignore | 3 +++ .reuse/dep5 | 7 +++++++ .travis.yml | 3 +++ CODE_OF_CONDUCT.adoc | 11 +++++++++++ CODE_OF_CONDUCT.md | 1 - Makefile | 3 +++ appveyor.yml | 2 ++ build_glslang_spirv_tools.sh | 2 ++ checkout_glslang_spirv_tools.sh | 2 ++ cmake/gitversion.in.h | 3 +++ format_all.sh | 2 ++ samples/cpp/Makefile | 3 +++ samples/cpp/atomics.comp | 3 +++ samples/cpp/multiply.comp | 3 +++ samples/cpp/shared.comp | 3 +++ test_shaders.sh | 2 ++ update_test_shaders.sh | 2 ++ 18 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 .reuse/dep5 create mode 100644 CODE_OF_CONDUCT.adoc delete mode 100644 CODE_OF_CONDUCT.md diff --git a/.clang-format b/.clang-format index 443f90b7..84552f33 100755 --- a/.clang-format +++ b/.clang-format @@ -1,3 +1,6 @@ +# Copyright 2016-2021 The Khronos Group Inc. +# SPDX-License-Identifier: Apache-2.0 + # The style used for all options not specifically set in the configuration. BasedOnStyle: LLVM diff --git a/.gitignore b/.gitignore index abd71895..8f96d114 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# Copyright 2016-2021 The Khronos Group Inc. +# SPDX-License-Identifier: Apache-2.0 + *.o *.d *.txt diff --git a/.reuse/dep5 b/.reuse/dep5 new file mode 100644 index 00000000..fa165ae7 --- /dev/null +++ b/.reuse/dep5 @@ -0,0 +1,7 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: SPIRV-Cross +Source: https://github.com/KhronosGroup/SPIRV-Cross + +Files: shaders*/* reference/* tests-other/* +Copyright: 2016-2021 The Khronos Group, Inc. +License: Apache-2.0 diff --git a/.travis.yml b/.travis.yml index 7791336e..b1ae52a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,6 @@ +# Copyright 2016-2021 The Khronos Group Inc. +# SPDX-License-Identifier: Apache-2.0 + language: - cpp - python diff --git a/CODE_OF_CONDUCT.adoc b/CODE_OF_CONDUCT.adoc new file mode 100644 index 00000000..ca5e08b9 --- /dev/null +++ b/CODE_OF_CONDUCT.adoc @@ -0,0 +1,11 @@ +// Copyright (c) 2016-2020 The Khronos Group Inc. +// +// SPDX-License-Identifier: CC-BY-4.0 + += Code of Conduct + +A reminder that this issue tracker is managed by the Khronos Group. +Interactions here should follow the +https://www.khronos.org/developers/code-of-conduct[Khronos Code of Conduct], +which prohibits aggressive or derogatory language. Please keep the +discussion friendly and civil. diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md deleted file mode 100644 index a11610bd..00000000 --- a/CODE_OF_CONDUCT.md +++ /dev/null @@ -1 +0,0 @@ -A reminder that this issue tracker is managed by the Khronos Group. Interactions here should follow the Khronos Code of Conduct (https://www.khronos.org/developers/code-of-conduct), which prohibits aggressive or derogatory language. Please keep the discussion friendly and civil. diff --git a/Makefile b/Makefile index 1f4e00b5..b44eb5e8 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,6 @@ +# Copyright 2016-2021 The Khronos Group Inc. +# SPDX-License-Identifier: Apache-2.0 + TARGET := spirv-cross SOURCES := $(wildcard spirv_*.cpp) diff --git a/appveyor.yml b/appveyor.yml index 2f427f18..cc2fade2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,3 +1,5 @@ +# Copyright 2016-2021 The Khronos Group Inc. +# SPDX-License-Identifier: Apache-2.0 environment: matrix: diff --git a/build_glslang_spirv_tools.sh b/build_glslang_spirv_tools.sh index fb4f7de2..f78640f3 100755 --- a/build_glslang_spirv_tools.sh +++ b/build_glslang_spirv_tools.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright 2016-2021 The Khronos Group Inc. +# SPDX-License-Identifier: Apache-2.0 PROFILE=Release diff --git a/checkout_glslang_spirv_tools.sh b/checkout_glslang_spirv_tools.sh index 02024c44..400f7cbc 100755 --- a/checkout_glslang_spirv_tools.sh +++ b/checkout_glslang_spirv_tools.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright 2016-2021 The Khronos Group Inc. +# SPDX-License-Identifier: Apache-2.0 GLSLANG_REV=3de5cfe50edecd001e6d703555284d9b10b3dd57 SPIRV_TOOLS_REV=f3ccb633dfd7c5de1f9f0a2d2e9d7a25f2478206 diff --git a/cmake/gitversion.in.h b/cmake/gitversion.in.h index 7135e283..bff73e96 100644 --- a/cmake/gitversion.in.h +++ b/cmake/gitversion.in.h @@ -1,3 +1,6 @@ +// Copyright 2016-2021 The Khronos Group Inc. +// SPDX-License-Identifier: Apache-2.0 + #ifndef SPIRV_CROSS_GIT_VERSION_H_ #define SPIRV_CROSS_GIT_VERSION_H_ diff --git a/format_all.sh b/format_all.sh index fcfffc57..001c3c5d 100755 --- a/format_all.sh +++ b/format_all.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright 2016-2021 The Khronos Group Inc. +# SPDX-License-Identifier: Apache-2.0 #for file in spirv_*.{cpp,hpp} include/spirv_cross/*.{hpp,h} samples/cpp/*.cpp main.cpp for file in spirv_*.{cpp,hpp} main.cpp diff --git a/samples/cpp/Makefile b/samples/cpp/Makefile index 225bb3d5..e5b66d4b 100644 --- a/samples/cpp/Makefile +++ b/samples/cpp/Makefile @@ -1,3 +1,6 @@ +# Copyright 2016-2021 The Khronos Group Inc. +# SPDX-License-Identifier: Apache-2.0 + SOURCES := $(wildcard *.comp) SPIRV := $(SOURCES:.comp=.spv) CPP_INTERFACE := $(SOURCES:.comp=.spv.cpp) diff --git a/samples/cpp/atomics.comp b/samples/cpp/atomics.comp index 0bf6d2ad..f3151247 100644 --- a/samples/cpp/atomics.comp +++ b/samples/cpp/atomics.comp @@ -1,3 +1,6 @@ +// Copyright 2016-2021 The Khronos Group Inc. +// SPDX-License-Identifier: Apache-2.0 + #version 310 es layout(local_size_x = 64) in; diff --git a/samples/cpp/multiply.comp b/samples/cpp/multiply.comp index 1ac7869a..678415ae 100644 --- a/samples/cpp/multiply.comp +++ b/samples/cpp/multiply.comp @@ -1,3 +1,6 @@ +// Copyright 2016-2021 The Khronos Group Inc. +// SPDX-License-Identifier: Apache-2.0 + #version 310 es layout(local_size_x = 64) in; diff --git a/samples/cpp/shared.comp b/samples/cpp/shared.comp index 7d59060a..a9d55d2c 100644 --- a/samples/cpp/shared.comp +++ b/samples/cpp/shared.comp @@ -1,3 +1,6 @@ +// Copyright 2016-2021 The Khronos Group Inc. +// SPDX-License-Identifier: Apache-2.0 + #version 310 es layout(local_size_x = 64) in; diff --git a/test_shaders.sh b/test_shaders.sh index dccdf342..c2ab2324 100755 --- a/test_shaders.sh +++ b/test_shaders.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright 2016-2021 The Khronos Group Inc. +# SPDX-License-Identifier: Apache-2.0 OPTS=$@ diff --git a/update_test_shaders.sh b/update_test_shaders.sh index c622eefc..85f9f0b7 100755 --- a/update_test_shaders.sh +++ b/update_test_shaders.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright 2016-2021 The Khronos Group Inc. +# SPDX-License-Identifier: Apache-2.0 ./test_shaders.sh --update