Skip to content

Commit ed0ba34

Browse files
committed
merge Khronos upstream
2 parents 4b6f710 + 6fe2055 commit ed0ba34

31 files changed

Lines changed: 21097 additions & 15683 deletions
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# SPDX-FileCopyrightText: 2026 The Khronos Group Inc.
2+
# SPDX-License-Identifier: Apache-2.0
3+
---
4+
name: REUSE Compliance Check
5+
on: [push, pull_request]
6+
permissions:
7+
contents: read
8+
jobs:
9+
reuse-compliance-check:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout
13+
uses: actions/checkout@v7
14+
- name: REUSE Compliance Check
15+
uses: fsfe/reuse-action@v6

‎.github/workflows/tools.yml‎

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,7 @@ jobs:
5353

5454

5555
steps:
56-
- uses: actions/checkout@v5
57-
- uses: actions/setup-python@v6
58-
with:
59-
python-version: '3.10'
56+
- uses: actions/checkout@v7
6057
- run: |
6158
sudo apt-get -qq update
6259
sudo apt install --yes libwayland-dev xorg-dev wayland-protocols
@@ -98,7 +95,7 @@ jobs:
9895
codegen:
9996
runs-on: ubuntu-latest
10097
steps:
101-
- uses: actions/checkout@v5
98+
- uses: actions/checkout@v7
10299
- run: scripts/update_deps.py --dir ext --no-build
103100
- run: scripts/generate_source.py --verify ext/Vulkan-Headers/registry/
104101

@@ -114,10 +111,7 @@ jobs:
114111
os: [ windows-latest ]
115112

116113
steps:
117-
- uses: actions/checkout@v5
118-
- uses: actions/setup-python@v6
119-
with:
120-
python-version: '3.10'
114+
- uses: actions/checkout@v7
121115
- uses: lukka/get-cmake@latest
122116
- uses: ilammy/msvc-dev-cmd@v1
123117
with:
@@ -142,10 +136,7 @@ jobs:
142136
runs-on: macos-latest
143137
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
144138
steps:
145-
- uses: actions/checkout@v5
146-
- uses: actions/setup-python@v6
147-
with:
148-
python-version: '3.8'
139+
- uses: actions/checkout@v7
149140
- uses: lukka/get-cmake@latest
150141

151142
- name: Setup ccache
@@ -173,8 +164,8 @@ jobs:
173164
matrix:
174165
abi: [ armeabi-v7a, arm64-v8a ]
175166
steps:
176-
- uses: actions/checkout@v5
177-
- uses: actions/setup-python@v6
167+
- uses: actions/checkout@v7
168+
- uses: actions/setup-python@v7
178169
with:
179170
python-version: '3.8'
180171
- uses: lukka/get-cmake@latest
@@ -206,14 +197,11 @@ jobs:
206197
run:
207198
shell: bash
208199
steps:
209-
- uses: actions/checkout@v5
200+
- uses: actions/checkout@v7
210201
- name: Setup ccache
211202
uses: hendrikmuhs/ccache-action@v1.2
212203
with:
213204
key: mingw-ccache
214-
- uses: actions/setup-python@v6
215-
with:
216-
python-version: '3.10'
217205
- uses: lukka/get-cmake@latest
218206
- name: GCC Version
219207
run: gcc --version # If this fails MINGW is not setup correctly
@@ -232,10 +220,11 @@ jobs:
232220
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
233221
runs-on: ubuntu-latest
234222
steps:
235-
- uses: actions/checkout@v5
236-
- uses: actions/setup-python@v6
223+
- uses: actions/checkout@v7
224+
- uses: actions/setup-python@v7
237225
with:
238226
python-version: '3.10'
227+
- run: pip install pyparsing
239228
- run: sudo apt-get -qq update && sudo apt install --yes libwayland-dev xorg-dev wayland-protocols
240229
- run: cmake -S . -B build/ -D UPDATE_DEPS=ON -D UPDATE_DEPS_DIR=external -D TOOLS_CODEGEN=ON
241230
- run: cmake --build build --target tools_codegen
@@ -246,5 +235,8 @@ jobs:
246235
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
247236
runs-on: ubuntu-latest
248237
steps:
249-
- uses: actions/checkout@v5
238+
- uses: actions/checkout@v7
239+
- uses: actions/setup-python@v7
240+
with:
241+
python-version: '3.10'
250242
- run: scripts/gn/gn.py

‎CMakeLists.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
cmake_minimum_required(VERSION 3.22.1)
1919

2020
# The VERSION field is generated with the "--generated-version" flag in the generate_source.py script
21-
project(Vulkan-Tools VERSION 1.4.332)
21+
project(Vulkan-Tools VERSION 1.4.363)
2222

2323
# This variable enables downstream users to customize the target API
2424
# variant (e.g. Vulkan SC)
@@ -61,6 +61,11 @@ if ((APPLE OR BUILD_TESTS) AND NOT ANDROID)
6161
find_package(VulkanLoader QUIET REQUIRED CONFIG)
6262
endif()
6363

64+
# Workaround AppleClang using the wrong headers when there are headers in /usr/local/include
65+
if (CMAKE_C_COMPILER_ID STREQUAL AppleClang AND TARGET Vulkan::Headers AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.25)
66+
set_target_properties(Vulkan::Headers PROPERTIES SYSTEM OFF)
67+
endif()
68+
6469
include(GNUInstallDirs)
6570

6671
if (BUILD_WERROR)

‎CONTRIBUTING.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,17 @@ More details can be found in [BUILD.md](BUILD.md).
9191
You will be prompted with a one-time "click-through" CLA dialog as part of submitting your pull request
9292
or other contribution to GitHub.
9393

94+
### **AI-Assisted Contributions**
95+
96+
By submitting a Contribution to this repository, you additionally represent
97+
that, to the extent any of Your Contributions were developed with the
98+
assistance of artificial intelligence tools or AI-generated code, You have
99+
exercised sufficient review, judgment, and creative direction over such tools
100+
and resulting material to reasonably consider it Your original creation, and
101+
You are not aware of any third-party license, intellectual property claim, or
102+
other restriction arising from such use that is associated with any part of
103+
Your Contribution or use thereof.
104+
94105
### **License and Copyrights**
95106

96107
All contributions made to the Vulkan-Tools repository are Khronos branded and as such,

‎LICENSES/Apache-2.0.txt‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
10+
11+
"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
12+
13+
"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
14+
15+
"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
16+
17+
"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
18+
19+
"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
20+
21+
"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
22+
23+
"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
24+
25+
"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
26+
27+
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
28+
29+
2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
30+
31+
3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
32+
33+
4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
34+
35+
(a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
36+
37+
(b) You must cause any modified files to carry prominent notices stating that You changed the files; and
38+
39+
(c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
40+
41+
(d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
42+
43+
You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
44+
45+
5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
46+
47+
6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
48+
49+
7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
50+
51+
8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
52+
53+
9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
54+
55+
END OF TERMS AND CONDITIONS
56+
57+
APPENDIX: How to apply the Apache License to your work.
58+
59+
To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
60+
61+
Copyright [yyyy] [name of copyright owner]
62+
63+
Licensed under the Apache License, Version 2.0 (the "License");
64+
you may not use this file except in compliance with the License.
65+
You may obtain a copy of the License at
66+
67+
http://www.apache.org/licenses/LICENSE-2.0
68+
69+
Unless required by applicable law or agreed to in writing, software
70+
distributed under the License is distributed on an "AS IS" BASIS,
71+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
72+
See the License for the specific language governing permissions and
73+
limitations under the License.

0 commit comments

Comments
 (0)