Skip to content

Commit 538f497

Browse files
committed
update glslang to version 15.4.0
add a nicer script to update
1 parent e8e99a0 commit 538f497

File tree

2,971 files changed

+634962
-5790
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,971 files changed

+634962
-5790
lines changed

third_party/glslang/.github/workflows/continuous_deployment.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
cmake_build_type: [Debug, Release]
4343
steps:
4444
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
45-
- uses: lukka/get-cmake@57c20a23a6cac5b90f31864439996e5b206df9dc # v4.0.1
45+
- uses: lukka/get-cmake@6b3e96a9bc9976b8b546346fdd102effedae0ca8 # v4.0.3
4646
- run: ./update_glslang_sources.py
4747
- name: Build
4848
env:
@@ -98,7 +98,7 @@ jobs:
9898
cmake_build_type: [Debug, Release]
9999
steps:
100100
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
101-
- uses: lukka/get-cmake@57c20a23a6cac5b90f31864439996e5b206df9dc # v4.0.1
101+
- uses: lukka/get-cmake@6b3e96a9bc9976b8b546346fdd102effedae0ca8 # v4.0.3
102102
- run: ./update_glslang_sources.py
103103
- name: Build
104104
env:
@@ -147,15 +147,15 @@ jobs:
147147
strategy:
148148
fail-fast: false
149149
matrix:
150-
os: [{genus: windows-2019, family: windows}]
150+
os: [{genus: windows-2022, family: windows}]
151151
cmake_build_type: [Debug, Release]
152152
steps:
153153
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
154-
- uses: lukka/get-cmake@57c20a23a6cac5b90f31864439996e5b206df9dc # v4.0.1
154+
- uses: lukka/get-cmake@6b3e96a9bc9976b8b546346fdd102effedae0ca8 # v4.0.3
155155
- run: python update_glslang_sources.py
156156
- name: Build
157157
run: |
158-
cmake -S. -Bbuild -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX="$PWD/build/install"
158+
cmake -S. -Bbuild -G "Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX="$PWD/build/install"
159159
cmake --build build --config ${{matrix.cmake_build_type}} --target install
160160
- name: Test
161161
run: |

third_party/glslang/.github/workflows/continuous_integration.yml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
cmake_build_type: [Debug, Release]
1919
steps:
2020
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
21-
- uses: lukka/get-cmake@57c20a23a6cac5b90f31864439996e5b206df9dc # v4.0.1
21+
- uses: lukka/get-cmake@6b3e96a9bc9976b8b546346fdd102effedae0ca8 # v4.0.3
2222
- name: Setup ccache
23-
uses: hendrikmuhs/ccache-action@a1209f81afb8c005c13b4296c32e363431bffea5 # v1.2.17
23+
uses: hendrikmuhs/ccache-action@63069e3931dedbf3b63792097479563182fe70d1 # v1.2.18
2424
with:
2525
key: ubuntu-22-${{ matrix.cmake_build_type }}-${{ matrix.compiler.cc }}-${{matrix.compiler.cxx}}
2626
- run: ./update_glslang_sources.py
@@ -54,9 +54,9 @@ jobs:
5454
cmake_build_type: [Release]
5555
steps:
5656
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
57-
- uses: lukka/get-cmake@57c20a23a6cac5b90f31864439996e5b206df9dc # v4.0.1
57+
- uses: lukka/get-cmake@6b3e96a9bc9976b8b546346fdd102effedae0ca8 # v4.0.3
5858
- name: Setup ccache
59-
uses: hendrikmuhs/ccache-action@a1209f81afb8c005c13b4296c32e363431bffea5 # v1.2.17
59+
uses: hendrikmuhs/ccache-action@63069e3931dedbf3b63792097479563182fe70d1 # v1.2.18
6060
with:
6161
key: ubuntu-22-${{ matrix.cmake_build_type }}-${{ matrix.compiler.cc }}-${{matrix.compiler.cxx}}
6262
- run: ./update_glslang_sources.py
@@ -89,9 +89,9 @@ jobs:
8989
flags: ['-fsanitize=address', '-fsanitize=thread', '-fsanitize=undefined']
9090
steps:
9191
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
92-
- uses: lukka/get-cmake@57c20a23a6cac5b90f31864439996e5b206df9dc # v4.0.1
92+
- uses: lukka/get-cmake@6b3e96a9bc9976b8b546346fdd102effedae0ca8 # v4.0.3
9393
- name: Setup ccache
94-
uses: hendrikmuhs/ccache-action@a1209f81afb8c005c13b4296c32e363431bffea5 # v1.2.17
94+
uses: hendrikmuhs/ccache-action@63069e3931dedbf3b63792097479563182fe70d1 # v1.2.18
9595
with:
9696
key: ubuntu-22-${{ matrix.cmake_build_type }}-${{ matrix.compiler.cc }}-${{matrix.compiler.cxx}}-${{matrix.flags}}
9797
# This is to combat a bug when using 6.6 linux kernels with thread/address sanitizer
@@ -124,14 +124,14 @@ jobs:
124124
runs-on: ubuntu-22.04
125125
steps:
126126
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
127-
- uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
127+
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
128128
with:
129129
python-version: '3.7'
130-
- uses: lukka/get-cmake@57c20a23a6cac5b90f31864439996e5b206df9dc # v4.0.1
130+
- uses: lukka/get-cmake@6b3e96a9bc9976b8b546346fdd102effedae0ca8 # v4.0.3
131131
with:
132132
cmakeVersion: 3.22.1
133133
- name: Setup ccache
134-
uses: hendrikmuhs/ccache-action@a1209f81afb8c005c13b4296c32e363431bffea5 # v1.2.17
134+
uses: hendrikmuhs/ccache-action@63069e3931dedbf3b63792097479563182fe70d1 # v1.2.18
135135
with:
136136
key: linux_backcompat
137137
- run: ./update_glslang_sources.py
@@ -161,7 +161,7 @@ jobs:
161161
cmake_build_type: [Debug, Release]
162162
steps:
163163
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
164-
- uses: lukka/get-cmake@57c20a23a6cac5b90f31864439996e5b206df9dc # v4.0.1
164+
- uses: lukka/get-cmake@6b3e96a9bc9976b8b546346fdd102effedae0ca8 # v4.0.3
165165
- run: ./update_glslang_sources.py
166166
- run: cmake -S . -B build -D CMAKE_BUILD_TYPE=${{matrix.cmake_build_type}} -G Ninja -DBUILD_WERROR=ON -D GLSLANG_TESTS=ON
167167
env:
@@ -185,7 +185,7 @@ jobs:
185185
cmake_build_type: [Release]
186186
steps:
187187
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
188-
- uses: lukka/get-cmake@57c20a23a6cac5b90f31864439996e5b206df9dc # v4.0.1
188+
- uses: lukka/get-cmake@6b3e96a9bc9976b8b546346fdd102effedae0ca8 # v4.0.3
189189
- run: ./update_glslang_sources.py
190190
- run: cmake -S . -B build -D CMAKE_BUILD_TYPE=${{matrix.cmake_build_type}} -G Ninja -DBUILD_WERROR=ON -D GLSLANG_TESTS=ON -DBUILD_SHARED_LIBS=ON
191191
env:
@@ -206,15 +206,15 @@ jobs:
206206
strategy:
207207
fail-fast: false
208208
matrix:
209-
os: [{genus: windows-2019, family: windows}]
209+
os: [{genus: windows-2022, family: windows}]
210210
cmake_build_type: [Debug, Release]
211211
steps:
212212
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
213-
- uses: lukka/get-cmake@57c20a23a6cac5b90f31864439996e5b206df9dc # v4.0.1
213+
- uses: lukka/get-cmake@6b3e96a9bc9976b8b546346fdd102effedae0ca8 # v4.0.3
214214
- run: python update_glslang_sources.py
215215
- name: Build
216216
run: |
217-
cmake -S. -Bbuild -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX="$PWD/build/install" -DBUILD_WERROR=ON -D GLSLANG_TESTS=ON
217+
cmake -S. -Bbuild -G "Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX="$PWD/build/install" -DBUILD_WERROR=ON -D GLSLANG_TESTS=ON
218218
cmake --build build --config ${{matrix.cmake_build_type}} --target install
219219
- name: Test find_package support
220220
run: |
@@ -230,15 +230,15 @@ jobs:
230230
strategy:
231231
fail-fast: false
232232
matrix:
233-
os: [{genus: windows-2019, family: windows}]
233+
os: [{genus: windows-2022, family: windows}]
234234
cmake_build_type: [Debug, Release]
235235
steps:
236236
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
237-
- uses: lukka/get-cmake@57c20a23a6cac5b90f31864439996e5b206df9dc # v4.0.1
237+
- uses: lukka/get-cmake@6b3e96a9bc9976b8b546346fdd102effedae0ca8 # v4.0.3
238238
- run: python update_glslang_sources.py
239239
- name: Build
240240
run: |
241-
cmake -S. -Bbuild -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX="$PWD/build/install" -DBUILD_WERROR=ON -D GLSLANG_TESTS=ON -DBUILD_SHARED_LIBS=ON
241+
cmake -S. -Bbuild -G "Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX="$PWD/build/install" -DBUILD_WERROR=ON -D GLSLANG_TESTS=ON -DBUILD_SHARED_LIBS=ON
242242
cmake --build build --config ${{matrix.cmake_build_type}} --target install
243243
- name: Test find_package support
244244
run: |
@@ -251,9 +251,9 @@ jobs:
251251
runs-on: macos-13
252252
steps:
253253
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
254-
- uses: lukka/get-cmake@57c20a23a6cac5b90f31864439996e5b206df9dc # v4.0.1
254+
- uses: lukka/get-cmake@6b3e96a9bc9976b8b546346fdd102effedae0ca8 # v4.0.3
255255
- name: Setup ccache
256-
uses: hendrikmuhs/ccache-action@a1209f81afb8c005c13b4296c32e363431bffea5 # v1.2.17
256+
uses: hendrikmuhs/ccache-action@63069e3931dedbf3b63792097479563182fe70d1 # v1.2.18
257257
with:
258258
key: IOS
259259
- run: ./update_glslang_sources.py
@@ -280,9 +280,9 @@ jobs:
280280
LEGACY: [ON, OFF]
281281
steps:
282282
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
283-
- uses: lukka/get-cmake@57c20a23a6cac5b90f31864439996e5b206df9dc # v4.0.1
283+
- uses: lukka/get-cmake@6b3e96a9bc9976b8b546346fdd102effedae0ca8 # v4.0.3
284284
- name: Setup ccache
285-
uses: hendrikmuhs/ccache-action@a1209f81afb8c005c13b4296c32e363431bffea5 # v1.2.17
285+
uses: hendrikmuhs/ccache-action@63069e3931dedbf3b63792097479563182fe70d1 # v1.2.18
286286
with:
287287
key: android-${{ matrix.LEGACY }}
288288
- run: ./update_glslang_sources.py
@@ -303,9 +303,9 @@ jobs:
303303
runs-on: ubuntu-22.04
304304
steps:
305305
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
306-
- uses: lukka/get-cmake@57c20a23a6cac5b90f31864439996e5b206df9dc # v4.0.1
306+
- uses: lukka/get-cmake@6b3e96a9bc9976b8b546346fdd102effedae0ca8 # v4.0.3
307307
- name: Setup ccache
308-
uses: hendrikmuhs/ccache-action@a1209f81afb8c005c13b4296c32e363431bffea5 # v1.2.17
308+
uses: hendrikmuhs/ccache-action@63069e3931dedbf3b63792097479563182fe70d1 # v1.2.18
309309
with:
310310
key: ubuntu-emscripten
311311
- uses: mymindstorm/setup-emsdk@6ab9eb1bda2574c4ddb79809fc9247783eaf9021 # v14

third_party/glslang/.github/workflows/scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
persist-credentials: false
2929

3030
- name: "Run analysis"
31-
uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
31+
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
3232
with:
3333
results_file: results.sarif
3434
results_format: sarif
@@ -48,6 +48,6 @@ jobs:
4848

4949
# Upload the results to GitHub's code scanning dashboard.
5050
- name: "Upload to code-scanning"
51-
uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
51+
uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
5252
with:
5353
sarif_file: results.sarif

third_party/glslang/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
*.exe
55
.cache/
66
.vscode/
7+
.vs/
78
tags
89
TAGS
910
bazel-*

third_party/glslang/CHANGES.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
All notable changes to this project will be documented in this file.
44
This project adheres to [Semantic Versioning](https://semver.org/).
55

6+
## 15.4.0 2025-06-26
7+
* Support GL_NV_gpu_shader5/GL_ARB_gpu_shader5
8+
* Remove BUILD_SHARED_LIBS option (defer to built-in variable)
9+
* Remap discard to OpDemoteToHelperInvocation
10+
* Fix typos and improve readability of help message
11+
* Support GLSL_QCOM_tile_shading
12+
* Emit correct capability for linear swept sphere
13+
* Support GL_EXT_float8_e5m2_e4m3
14+
* Move E_SPV_ARM_cooperative_matrix_layouts into GLSL.ext.ARM.h
15+
* Support GL_ARM_tensors
16+
617
## 15.3.0 2025-04-24
718
* Fix CMake find_package on Windows when building shared libraries
819
* Fix crash calling coopMatLoadTensorNV on an array element

third_party/glslang/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ include(CMakePackageConfigHelpers)
4545
# Needed for cmake_dependent_option macro
4646
include(CMakeDependentOption)
4747

48-
option(BUILD_SHARED_LIBS "Build Shared Libraries")
4948
option(BUILD_EXTERNAL "Build external dependencies in /External" ON)
5049
option(BUILD_WERROR "Enable warnings as errors (default is OFF)" OFF)
5150

third_party/glslang/SPIRV/GLSL.ext.ARM.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
** Copyright (c) 2022 ARM Limited
2+
** Copyright (c) 2022, 2025 ARM Limited
33
**
44
** Permission is hereby granted, free of charge, to any person obtaining a copy
55
** of this software and/or associated documentation files (the "Materials"),
@@ -28,8 +28,10 @@
2828
#define GLSLextARM_H
2929

3030
static const int GLSLextARMVersion = 100;
31-
static const int GLSLextARMRevision = 1;
31+
static const int GLSLextARMRevision = 2;
3232

33-
static const char * const E_SPV_ARM_core_builtins = "SPV_ARM_core_builtins";
33+
static const char* const E_SPV_ARM_core_builtins = "SPV_ARM_core_builtins";
34+
static const char* const E_SPV_ARM_cooperative_matrix_layouts = "SPV_ARM_cooperative_matrix_layouts";
35+
static const char* const E_SPV_ARM_tensors = "SPV_ARM_tensors";
3436

3537
#endif // #ifndef GLSLextARM_H

third_party/glslang/SPIRV/GLSL.ext.EXT.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ static const char* const E_SPV_EXT_shader_atomic_float_min_max = "SPV_EXT_shader
4141
static const char* const E_SPV_EXT_shader_image_int64 = "SPV_EXT_shader_image_int64";
4242
static const char* const E_SPV_EXT_shader_tile_image = "SPV_EXT_shader_tile_image";
4343
static const char* const E_SPV_EXT_mesh_shader = "SPV_EXT_mesh_shader";
44-
static const char* const E_SPV_ARM_cooperative_matrix_layouts = "SPV_ARM_cooperative_matrix_layouts";
44+
static const char* const E_SPV_EXT_float8 = "SPV_EXT_float8";
4545

4646
#endif // #ifndef GLSLextEXT_H

third_party/glslang/SPIRV/GLSL.ext.QCOM.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,7 @@ const char* const E_SPV_QCOM_image_processing = "SPV_QCOM_image_processing";
4040
//SPV_QCOM_image_processing2
4141
const char* const E_SPV_QCOM_image_processing2 = "SPV_QCOM_image_processing2";
4242

43+
//SPV_QCOM_tile_shading
44+
const char* const E_SPV_QCOM_tile_shading = "SPV_QCOM_tile_shading";
45+
4346
#endif // #ifndef GLSLextQCOM_H

0 commit comments

Comments
 (0)