diff --git a/.clang-format b/.clang-format index 453527f..5655ec2 100644 --- a/.clang-format +++ b/.clang-format @@ -1,3 +1,9 @@ +# Copyright 2023 The Khronos Group Inc. +# Copyright 2023 Valve Corporation +# Copyright 2023 LunarG, Inc. +# +# SPDX-License-Identifier: Apache-2.0 + --- # Use defaults from the Google style with the following exceptions: BasedOnStyle: Google diff --git a/.github/workflows/vul.yml b/.github/workflows/ci.yml similarity index 78% rename from .github/workflows/vul.yml rename to .github/workflows/ci.yml index 775a4bf..1e69892 100644 --- a/.github/workflows/vul.yml +++ b/.github/workflows/ci.yml @@ -1,19 +1,10 @@ -# Copyright (c) 2023 Valve Corporation -# Copyright (c) 2023 LunarG, Inc. +# Copyright 2023 The Khronos Group Inc. +# Copyright 2023 Valve Corporation +# Copyright 2023 LunarG, Inc. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# SPDX-License-Identifier: Apache-2.0 -name: Vulkan Utility Library (Build/Tests) +name: ci on: push: @@ -74,3 +65,10 @@ jobs: -G "Ninja" - name: Build run: cmake --build build + + reuse: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: REUSE Compliance Check + uses: fsfe/reuse-action@v1 \ No newline at end of file diff --git a/.gitignore b/.gitignore index 118e39e..400987e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,9 @@ -# Python cache +# Copyright 2023 The Khronos Group Inc. +# Copyright 2023 Valve Corporation +# Copyright 2023 LunarG, Inc. +# +# SPDX-License-Identifier: Apache-2.0 + __pycache__ *.pyc build diff --git a/.reuse/dep5 b/.reuse/dep5 new file mode 100644 index 0000000..5d336fe --- /dev/null +++ b/.reuse/dep5 @@ -0,0 +1,8 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Vulkan Utility Libraries +Source: https://github.com/KhronosGroup/Vulkan-Utility-Libraries + +# These files are routinely updated from another repo +Files: scripts/known_good.json scripts/update_deps.py scripts/CMakeLists.txt +Copyright: 2023 The Khronos Group Inc. +License: Apache-2.0 diff --git a/BUILD.md b/BUILD.md index c087aee..85e420a 100644 --- a/BUILD.md +++ b/BUILD.md @@ -1,3 +1,11 @@ + + # Build Instructions This document contains the instructions for building this repository on Linux, macOS and Windows. diff --git a/CMakeLists.txt b/CMakeLists.txt index a6fe0ff..bf8c147 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,17 +1,8 @@ -# Copyright (c) 2023 Valve Corporation -# Copyright (c) 2023 LunarG, Inc. +# Copyright 2023 The Khronos Group Inc. +# Copyright 2023 Valve Corporation +# Copyright 2023 LunarG, Inc. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# SPDX-License-Identifier: Apache-2.0 cmake_minimum_required(VERSION 3.17.2) project(VUL LANGUAGES CXX) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index a11610b..1374e00 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1 +1,9 @@ + + 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/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..9c0c5d0 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,11 @@ + + +Files in this repository fall under the `Apache-2.0` license. + +Full license text of these licenses is available at https://opensource.org/licenses/Apache-2.0 diff --git a/LICENSE.txt b/LICENSES/Apache-2.0.txt similarity index 100% rename from LICENSE.txt rename to LICENSES/Apache-2.0.txt diff --git a/README.md b/README.md index 9cf3b47..2a1ad52 100644 --- a/README.md +++ b/README.md @@ -1 +1,9 @@ + + # Vulkan-Utility-Libraries \ No newline at end of file diff --git a/docs/generated_code.md b/docs/generated_code.md index 5eb37b8..69c8b1f 100644 --- a/docs/generated_code.md +++ b/docs/generated_code.md @@ -1,3 +1,11 @@ + + # How to generate the code - Linux: diff --git a/docs/vulkan_layer_settings.md b/docs/vulkan_layer_settings.md index 09b8c07..6cd7c05 100644 --- a/docs/vulkan_layer_settings.md +++ b/docs/vulkan_layer_settings.md @@ -1 +1,9 @@ + + # Vulkan-Layer-Settings library \ No newline at end of file diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 360004f..6635d59 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1,17 +1,8 @@ -# Copyright (c) 2023 Valve Corporation -# Copyright (c) 2023 LunarG, Inc. +# Copyright 2023 The Khronos Group Inc. +# Copyright 2023 Valve Corporation +# Copyright 2023 LunarG, Inc. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# SPDX-License-Identifier: Apache-2.0 target_include_directories(VulkanLayerSettings PUBLIC $) target_sources(VulkanLayerSettings PRIVATE diff --git a/include/vulkan/layer/vk_layer_settings.h b/include/vulkan/layer/vk_layer_settings.h index 4e7f01c..c9e55fb 100644 --- a/include/vulkan/layer/vk_layer_settings.h +++ b/include/vulkan/layer/vk_layer_settings.h @@ -1,23 +1,11 @@ -/* - * Copyright (c) 2023 The Khronos Group Inc. - * Copyright (c) 2023 Valve Corporation - * Copyright (c) 2023 LunarG, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Authors: - * - Christophe Riccio - */ +// Copyright 2023 The Khronos Group Inc. +// Copyright 2023 Valve Corporation +// Copyright 2023 LunarG, Inc. +// +// SPDX-License-Identifier: Apache-2.0 +// +// Author(s): +// - Christophe Riccio #pragma once diff --git a/include/vulkan/layer/vk_layer_settings.hpp b/include/vulkan/layer/vk_layer_settings.hpp index 7dae424..8355783 100644 --- a/include/vulkan/layer/vk_layer_settings.hpp +++ b/include/vulkan/layer/vk_layer_settings.hpp @@ -1,23 +1,11 @@ -/* - * Copyright (c) 2023 The Khronos Group Inc. - * Copyright (c) 2023 Valve Corporation - * Copyright (c) 2023 LunarG, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Authors: - * - Christophe Riccio - */ +// Copyright 2023 The Khronos Group Inc. +// Copyright 2023 Valve Corporation +// Copyright 2023 LunarG, Inc. +// +// SPDX-License-Identifier: Apache-2.0 +// +// Author(s): +// - Christophe Riccio #pragma once diff --git a/include/vulkan/layer/vk_layer_settings_ext.h b/include/vulkan/layer/vk_layer_settings_ext.h index 77dd8da..5d886bc 100644 --- a/include/vulkan/layer/vk_layer_settings_ext.h +++ b/include/vulkan/layer/vk_layer_settings_ext.h @@ -1,23 +1,11 @@ -/* - * Copyright (c) 2023 The Khronos Group Inc. - * Copyright (c) 2023 Valve Corporation - * Copyright (c) 2023 LunarG, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Authors: - * - Christophe Riccio - */ +// Copyright 2023 The Khronos Group Inc. +// Copyright 2023 Valve Corporation +// Copyright 2023 LunarG, Inc. +// +// SPDX-License-Identifier: Apache-2.0 +// +// Author(s): +// - Christophe Riccio #pragma once diff --git a/include/vulkan/vk_enum_string_helper.h b/include/vulkan/vk_enum_string_helper.h index 42dd00b..d589af9 100644 --- a/include/vulkan/vk_enum_string_helper.h +++ b/include/vulkan/vk_enum_string_helper.h @@ -1,24 +1,11 @@ // *** THIS FILE IS GENERATED - DO NOT EDIT *** // See enum_string_helper_generator.py for modifications -/*************************************************************************** -* -* Copyright (c) 2015-2023 The Khronos Group Inc. -* Copyright (c) 2015-2023 Valve Corporation -* Copyright (c) 2015-2023 LunarG, Inc. -* Copyright (c) 2015-2023 Google Inc. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -****************************************************************************/ +// Copyright 2023 The Khronos Group Inc. +// Copyright 2023 Valve Corporation +// Copyright 2023 LunarG, Inc. +// Copyright 2023 Google Inc. +// +// SPDX-License-Identifier: Apache-2.0 // NOLINTBEGIN #pragma once #include diff --git a/scripts/generate_source.py b/scripts/generate_source.py index 54730b8..fa5d2f0 100644 --- a/scripts/generate_source.py +++ b/scripts/generate_source.py @@ -1,18 +1,9 @@ #!/usr/bin/env python3 -# Copyright (c) 2023 Valve Corporation -# Copyright (c) 2023 LunarG, Inc. +# Copyright 2023 The Khronos Group Inc. +# Copyright 2023 Valve Corporation +# Copyright 2023 LunarG, Inc. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# SPDX-License-Identifier: Apache-2.0 import argparse import os diff --git a/scripts/generators/base_generator.py b/scripts/generators/base_generator.py index ddefb90..5134ed2 100644 --- a/scripts/generators/base_generator.py +++ b/scripts/generators/base_generator.py @@ -1,20 +1,11 @@ #!/usr/bin/python3 -i # -# Copyright (c) 2023 Valve Corporation -# Copyright (c) 2023 LunarG, Inc. -# Copyright (c) 2023 RasterGrid Kft. +# Copyright 2023 The Khronos Group Inc. +# Copyright 2023 Valve Corporation +# Copyright 2023 LunarG, Inc. +# Copyright 2023 RasterGrid Kft. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# SPDX-License-Identifier: Apache-2.0 from generators.vulkan_object import (VulkanObject, Extension, Version, Handle, Param, Queues, CommandScope, Command, diff --git a/scripts/generators/dispatch_table_helper_generator.py b/scripts/generators/dispatch_table_helper_generator.py index 9330748..fca1c4b 100644 --- a/scripts/generators/dispatch_table_helper_generator.py +++ b/scripts/generators/dispatch_table_helper_generator.py @@ -1,21 +1,10 @@ #!/usr/bin/python3 -i + +# Copyright 2023 The Khronos Group Inc. +# Copyright 2023 Valve Corporation +# Copyright 2023 LunarG, Inc. # -# Copyright (c) 2015-2023 The Khronos Group Inc. -# Copyright (c) 2015-2023 Valve Corporation -# Copyright (c) 2015-2023 LunarG, Inc. -# Copyright (c) 2015-2023 Google Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# SPDX-License-Identifier: Apache-2.0 import os from generators.base_generator import BaseGenerator @@ -29,25 +18,12 @@ def generate(self): out = [] out.append(f'''// *** THIS FILE IS GENERATED - DO NOT EDIT *** // See {os.path.basename(__file__)} for modifications -/*************************************************************************** -* -* Copyright (c) 2015-2023 The Khronos Group Inc. -* Copyright (c) 2015-2023 Valve Corporation -* Copyright (c) 2015-2023 LunarG, Inc. -* Copyright (c) 2015-2023 Google Inc. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -****************************************************************************/\n''') +// Copyright 2023 The Khronos Group Inc. +// Copyright 2023 Valve Corporation +// Copyright 2023 LunarG, Inc. +// +// SPDX-License-Identifier: Apache-2.0 +\n''') out.append('// NOLINTBEGIN') # Wrap for clang-tidy to ignore out.append(''' diff --git a/scripts/generators/enum_string_helper_generator.py b/scripts/generators/enum_string_helper_generator.py index e94befd..718b04c 100644 --- a/scripts/generators/enum_string_helper_generator.py +++ b/scripts/generators/enum_string_helper_generator.py @@ -1,22 +1,10 @@ #!/usr/bin/python3 -i # -# Copyright (c) 2015-2023 The Khronos Group Inc. -# Copyright (c) 2015-2023 Valve Corporation -# Copyright (c) 2015-2023 LunarG, Inc. -# Copyright (c) 2015-2023 Google Inc. -# Copyright (c) 2023-2023 RasterGrid Kft. +# Copyright 2023 The Khronos Group Inc. +# Copyright 2023 Valve Corporation +# Copyright 2023 LunarG, Inc. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# SPDX-License-Identifier: Apache-2.0 import os from generators.base_generator import BaseGenerator @@ -29,25 +17,11 @@ def generate(self): out = [] out.append(f'''// *** THIS FILE IS GENERATED - DO NOT EDIT *** // See {os.path.basename(__file__)} for modifications -/*************************************************************************** -* -* Copyright (c) 2015-2023 The Khronos Group Inc. -* Copyright (c) 2015-2023 Valve Corporation -* Copyright (c) 2015-2023 LunarG, Inc. -* Copyright (c) 2015-2023 Google Inc. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -****************************************************************************/ +// Copyright 2023 The Khronos Group Inc. +// Copyright 2023 Valve Corporation +// Copyright 2023 LunarG, Inc. +// +// SPDX-License-Identifier: Apache-2.0 ''') out.append('// NOLINTBEGIN') # Wrap for clang-tidy to ignore diff --git a/scripts/generators/layer_dispatch_table_generator.py b/scripts/generators/layer_dispatch_table_generator.py index 8077b34..97f7515 100644 --- a/scripts/generators/layer_dispatch_table_generator.py +++ b/scripts/generators/layer_dispatch_table_generator.py @@ -1,21 +1,10 @@ #!/usr/bin/python3 -i # -# Copyright (c) 2015-2023 The Khronos Group Inc. -# Copyright (c) 2015-2023 Valve Corporation -# Copyright (c) 2015-2023 LunarG, Inc. -# Copyright (c) 2015-2023 Google Inc. +# Copyright 2023 The Khronos Group Inc. +# Copyright 2023 Valve Corporation +# Copyright 2023 LunarG, Inc. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# SPDX-License-Identifier: Apache-2.0 import os from generators.base_generator import BaseGenerator @@ -28,25 +17,12 @@ def generate(self): out = [] out.append(f'''// *** THIS FILE IS GENERATED - DO NOT EDIT *** // See {os.path.basename(__file__)} for modifications -/*************************************************************************** -* -* Copyright (c) 2015-2023 The Khronos Group Inc. -* Copyright (c) 2015-2023 Valve Corporation -* Copyright (c) 2015-2023 LunarG, Inc. -* Copyright (c) 2015-2023 Google Inc. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -****************************************************************************/\n''') +// Copyright 2023 The Khronos Group Inc. +// Copyright 2023 Valve Corporation +// Copyright 2023 LunarG, Inc. +// +// SPDX-License-Identifier: Apache-2.0 +\n''') out.append('// NOLINTBEGIN') # Wrap for clang-tidy to ignore out.append(''' diff --git a/scripts/generators/vulkan_object.py b/scripts/generators/vulkan_object.py index 4b8cfdc..b5741e6 100644 --- a/scripts/generators/vulkan_object.py +++ b/scripts/generators/vulkan_object.py @@ -1,19 +1,10 @@ #!/usr/bin/python3 -i # -# Copyright (c) 2023 Valve Corporation -# Copyright (c) 2023 LunarG, Inc. +# Copyright 2023 The Khronos Group Inc. +# Copyright 2023 Valve Corporation +# Copyright 2023 LunarG, Inc. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# SPDX-License-Identifier: Apache-2.0 from dataclasses import dataclass, field from enum import IntFlag, Enum, auto diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 92413c5..4176ca8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,16 +1,6 @@ -# Copyright (c) 2023 Valve Corporation -# Copyright (c) 2023 LunarG, Inc. +# Copyright 2023 The Khronos Group Inc. +# Copyright 2023 Valve Corporation +# Copyright 2023 LunarG, Inc. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - +# SPDX-License-Identifier: Apache-2.0 add_subdirectory(layer) diff --git a/src/layer/CMakeLists.txt b/src/layer/CMakeLists.txt index cbfd814..e28e0a1 100644 --- a/src/layer/CMakeLists.txt +++ b/src/layer/CMakeLists.txt @@ -1,18 +1,8 @@ -# Copyright (c) 2023 Valve Corporation -# Copyright (c) 2023 LunarG, Inc. +# Copyright 2023 The Khronos Group Inc. +# Copyright 2023 Valve Corporation +# Copyright 2023 LunarG, Inc. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - +# SPDX-License-Identifier: Apache-2.0 set(CMAKE_FOLDER "${CMAKE_FOLDER}/VulkanLayerSettings") add_library(VulkanLayerSettings STATIC) diff --git a/src/layer/layer_settings_manager.cpp b/src/layer/layer_settings_manager.cpp index de06dfb..8e6a3ef 100644 --- a/src/layer/layer_settings_manager.cpp +++ b/src/layer/layer_settings_manager.cpp @@ -1,23 +1,11 @@ -/* - * Copyright (c) 2023 Valve Corporation - * Copyright (c) 2023 LunarG, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Authors: - * - Christophe Riccio - */ - +// Copyright 2023 The Khronos Group Inc. +// Copyright 2023 Valve Corporation +// Copyright 2023 LunarG, Inc. +// +// SPDX-License-Identifier: Apache-2.0 +// +// Author(s): +// - Christophe Riccio #include "layer_settings_manager.hpp" #include "layer_settings_util.hpp" diff --git a/src/layer/layer_settings_manager.hpp b/src/layer/layer_settings_manager.hpp index 87ad977..7d8e1e2 100644 --- a/src/layer/layer_settings_manager.hpp +++ b/src/layer/layer_settings_manager.hpp @@ -1,23 +1,11 @@ -/* - * Copyright (c) 2023 Valve Corporation - * Copyright (c) 2023 LunarG, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Authors: - * - Christophe Riccio - */ - +// Copyright 2023 The Khronos Group Inc. +// Copyright 2023 Valve Corporation +// Copyright 2023 LunarG, Inc. +// +// SPDX-License-Identifier: Apache-2.0 +// +// Author(s): +// - Christophe Riccio #pragma once #include "vulkan/layer/vk_layer_settings.h" diff --git a/src/layer/layer_settings_util.cpp b/src/layer/layer_settings_util.cpp index 3256b63..a03d478 100644 --- a/src/layer/layer_settings_util.cpp +++ b/src/layer/layer_settings_util.cpp @@ -1,23 +1,11 @@ -/* - * Copyright (c) 2023 Valve Corporation - * Copyright (c) 2023 LunarG, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Authors: - * - Christophe Riccio - */ - +// Copyright 2023 The Khronos Group Inc. +// Copyright 2023 Valve Corporation +// Copyright 2023 LunarG, Inc. +// +// SPDX-License-Identifier: Apache-2.0 +// +// Author(s): +// - Christophe Riccio #include "layer_settings_util.hpp" #include diff --git a/src/layer/layer_settings_util.hpp b/src/layer/layer_settings_util.hpp index 401b858..28a0f8f 100644 --- a/src/layer/layer_settings_util.hpp +++ b/src/layer/layer_settings_util.hpp @@ -1,23 +1,11 @@ -/* - * Copyright (c) 2023 Valve Corporation - * Copyright (c) 2023 LunarG, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Authors: - * - Christophe Riccio - */ - +// Copyright 2023 The Khronos Group Inc. +// Copyright 2023 Valve Corporation +// Copyright 2023 LunarG, Inc. +// +// SPDX-License-Identifier: Apache-2.0 +// +// Author(s): +// - Christophe Riccio #pragma once #include "vulkan/layer/vk_layer_settings.h" diff --git a/src/layer/vk_layer_settings.cpp b/src/layer/vk_layer_settings.cpp index 748d558..21fe30a 100644 --- a/src/layer/vk_layer_settings.cpp +++ b/src/layer/vk_layer_settings.cpp @@ -1,25 +1,11 @@ -/* - * Copyright (c) 2023 The Khronos Group Inc. - * Copyright (c) 2023 Valve Corporation - * Copyright (c) 2023 LunarG, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Authors: - * - Christophe Riccio - * - Mark Lobodzinski - */ - +// Copyright 2023 The Khronos Group Inc. +// Copyright 2023 Valve Corporation +// Copyright 2023 LunarG, Inc. +// +// SPDX-License-Identifier: Apache-2.0 +// +// Author(s): +// - Christophe Riccio #include "vulkan/layer/vk_layer_settings.h" #include "layer_settings_util.hpp" #include "layer_settings_manager.hpp" diff --git a/src/layer/vk_layer_settings_helper.cpp b/src/layer/vk_layer_settings_helper.cpp index 7f6c3c0..47e45f0 100644 --- a/src/layer/vk_layer_settings_helper.cpp +++ b/src/layer/vk_layer_settings_helper.cpp @@ -1,24 +1,11 @@ -/* - * Copyright (c) 2023 The Khronos Group Inc. - * Copyright (c) 2023 Valve Corporation - * Copyright (c) 2023 LunarG, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Authors: - * - Christophe Riccio - */ - +// Copyright 2023 The Khronos Group Inc. +// Copyright 2023 Valve Corporation +// Copyright 2023 LunarG, Inc. +// +// SPDX-License-Identifier: Apache-2.0 +// +// Author(s): +// - Christophe Riccio #include "vulkan/layer/vk_layer_settings.hpp" void vlGetLayerSettingValue(VlLayerSettingSet layerSettingSet, const char *pSettingName, bool &settingValue) { diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index b6dea7b..2825faa 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,17 +1,7 @@ -# Copyright (c) 2023 Valve Corporation -# Copyright (c) 2023 LunarG, Inc. +# Copyright 2023 The Khronos Group Inc. +# Copyright 2023 Valve Corporation +# Copyright 2023 LunarG, Inc. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - +# SPDX-License-Identifier: Apache-2.0 add_subdirectory(layer) add_subdirectory(generated) diff --git a/tests/add_subdirectory/CMakeLists.txt b/tests/add_subdirectory/CMakeLists.txt index e801d64..650608c 100644 --- a/tests/add_subdirectory/CMakeLists.txt +++ b/tests/add_subdirectory/CMakeLists.txt @@ -1,18 +1,8 @@ -# Copyright (c) 2023 Valve Corporation -# Copyright (c) 2023 LunarG, Inc. +# Copyright 2023 The Khronos Group Inc. +# Copyright 2023 Valve Corporation +# Copyright 2023 LunarG, Inc. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - +# SPDX-License-Identifier: Apache-2.0 cmake_minimum_required(VERSION 3.17) project(TEST_ADD_SUBDIRECTORY LANGUAGES C) diff --git a/tests/add_subdirectory/client.c b/tests/add_subdirectory/client.c index 6f51b2f..8b97174 100644 --- a/tests/add_subdirectory/client.c +++ b/tests/add_subdirectory/client.c @@ -1,3 +1,8 @@ +// Copyright 2023 The Khronos Group Inc. +// Copyright 2023 Valve Corporation +// Copyright 2023 LunarG, Inc. +// +// SPDX-License-Identifier: Apache-2.0 #include VkBool32 foobar() { diff --git a/tests/find_package/CMakeLists.txt b/tests/find_package/CMakeLists.txt index 35660a1..ff38a7d 100644 --- a/tests/find_package/CMakeLists.txt +++ b/tests/find_package/CMakeLists.txt @@ -1,18 +1,8 @@ -# Copyright (c) 2023 Valve Corporation -# Copyright (c) 2023 LunarG, Inc. +# Copyright 2023 The Khronos Group Inc. +# Copyright 2023 Valve Corporation +# Copyright 2023 LunarG, Inc. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - +# SPDX-License-Identifier: Apache-2.0 cmake_minimum_required(VERSION 3.17) project(TEST_FIND_PACKAGE LANGUAGES C) diff --git a/tests/generated/CMakeLists.txt b/tests/generated/CMakeLists.txt index ff56219..2e01845 100644 --- a/tests/generated/CMakeLists.txt +++ b/tests/generated/CMakeLists.txt @@ -1,4 +1,8 @@ - +# Copyright 2023 The Khronos Group Inc. +# Copyright 2023 Valve Corporation +# Copyright 2023 LunarG, Inc. +# +# SPDX-License-Identifier: Apache-2.0 if(${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)") add_compile_options(-Wpedantic -Wall -Wextra -Werror) endif() diff --git a/tests/generated/vk_enum_string_helper.cpp b/tests/generated/vk_enum_string_helper.cpp index 50681b1..f6505e3 100644 --- a/tests/generated/vk_enum_string_helper.cpp +++ b/tests/generated/vk_enum_string_helper.cpp @@ -1,3 +1,8 @@ +// Copyright 2023 The Khronos Group Inc. +// Copyright 2023 Valve Corporation +// Copyright 2023 LunarG, Inc. +// +// SPDX-License-Identifier: Apache-2.0 #include // TODO: Add actual testing diff --git a/tests/layer/CMakeLists.txt b/tests/layer/CMakeLists.txt index d6de626..9095d3b 100644 --- a/tests/layer/CMakeLists.txt +++ b/tests/layer/CMakeLists.txt @@ -1,17 +1,8 @@ -# Copyright (c) 2023 Valve Corporation -# Copyright (c) 2023 LunarG, Inc. +# Copyright 2023 The Khronos Group Inc. +# Copyright 2023 Valve Corporation +# Copyright 2023 LunarG, Inc. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# SPDX-License-Identifier: Apache-2.0 set(CMAKE_FOLDER "${CMAKE_FOLDER}/VulkanLayerSettings/tests") find_package(GTest REQUIRED CONFIG) diff --git a/tests/layer/test_setting_api.cpp b/tests/layer/test_setting_api.cpp index 63f7512..1304b09 100644 --- a/tests/layer/test_setting_api.cpp +++ b/tests/layer/test_setting_api.cpp @@ -1,23 +1,11 @@ -/* - * Copyright (c) 2023-2023 Valve Corporation - * Copyright (c) 2023-2023 LunarG, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Authors: - * - Christophe Riccio - */ - +// Copyright 2023 The Khronos Group Inc. +// Copyright 2023 Valve Corporation +// Copyright 2023 LunarG, Inc. +// +// SPDX-License-Identifier: Apache-2.0 +// +// Author(s): +// - Christophe Riccio #include #include "vulkan/layer/vk_layer_settings.h" diff --git a/tests/layer/test_setting_cpp.cpp b/tests/layer/test_setting_cpp.cpp index e7f2b0b..170615d 100644 --- a/tests/layer/test_setting_cpp.cpp +++ b/tests/layer/test_setting_cpp.cpp @@ -1,23 +1,11 @@ -/* - * Copyright (c) 2023-2023 Valve Corporation - * Copyright (c) 2023-2023 LunarG, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Authors: - * - Christophe Riccio - */ - +// Copyright 2023 The Khronos Group Inc. +// Copyright 2023 Valve Corporation +// Copyright 2023 LunarG, Inc. +// +// SPDX-License-Identifier: Apache-2.0 +// +// Author(s): +// - Christophe Riccio #include #include "vulkan/layer/vk_layer_settings.hpp" diff --git a/tests/layer/test_setting_env.cpp b/tests/layer/test_setting_env.cpp index 3a0acab..3897919 100644 --- a/tests/layer/test_setting_env.cpp +++ b/tests/layer/test_setting_env.cpp @@ -1,23 +1,11 @@ -/* - * Copyright (c) 2023-2023 Valve Corporation - * Copyright (c) 2023-2023 LunarG, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Authors: - * - Christophe Riccio - */ - +// Copyright 2023 The Khronos Group Inc. +// Copyright 2023 Valve Corporation +// Copyright 2023 LunarG, Inc. +// +// SPDX-License-Identifier: Apache-2.0 +// +// Author(s): +// - Christophe Riccio #include #include "vulkan/layer/vk_layer_settings.h" diff --git a/tests/layer/test_setting_file.cpp b/tests/layer/test_setting_file.cpp index 80c56f9..a4468f2 100644 --- a/tests/layer/test_setting_file.cpp +++ b/tests/layer/test_setting_file.cpp @@ -1,23 +1,11 @@ -/* - * Copyright (c) 2023-2023 Valve Corporation - * Copyright (c) 2023-2023 LunarG, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Authors: - * - Christophe Riccio - */ - +// Copyright 2023 The Khronos Group Inc. +// Copyright 2023 Valve Corporation +// Copyright 2023 LunarG, Inc. +// +// SPDX-License-Identifier: Apache-2.0 +// +// Author(s): +// - Christophe Riccio #include #include "vulkan/layer/vk_layer_settings.h" diff --git a/tests/layer/test_setting_util.cpp b/tests/layer/test_setting_util.cpp index e05ab45..4097a1d 100644 --- a/tests/layer/test_setting_util.cpp +++ b/tests/layer/test_setting_util.cpp @@ -1,23 +1,11 @@ -/* - * Copyright (c) 2023-2023 Valve Corporation - * Copyright (c) 2023-2023 LunarG, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Authors: - * - Christophe Riccio - */ - +// Copyright 2023 The Khronos Group Inc. +// Copyright 2023 Valve Corporation +// Copyright 2023 LunarG, Inc. +// +// SPDX-License-Identifier: Apache-2.0 +// +// Author(s): +// - Christophe Riccio #include "layer_settings_util.hpp" #include