Skip to content

Commit 57e6cbf

Browse files
authored
Merge pull request #4 from kd-11/sdk_268
Sync with SDK ver 1.3.268.0
2 parents b8f9add + 4cd662d commit 57e6cbf

File tree

1,145 files changed

+51849
-21069
lines changed

Some content is hidden

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

1,145 files changed

+51849
-21069
lines changed

.appveyor.yml

Lines changed: 0 additions & 108 deletions
This file was deleted.

.github/dependabot.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Copyright 2023 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
version: 2
16+
updates:
17+
- package-ecosystem: "github-actions" # Necessary to update action hashes
18+
directory: "/"
19+
schedule:
20+
interval: "weekly"
21+
# Allow up to 3 opened pull requests for github-actions versions
22+
open-pull-requests-limit: 3

.github/workflows/continuous_deployment.yml

Lines changed: 123 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,36 @@ on:
2020
workflow_dispatch:
2121
push:
2222
branches:
23-
- master
23+
- main
24+
paths-ignore:
25+
- 'README.md'
26+
- 'README-spirv-remap.txt'
27+
- 'LICENSE.txt'
28+
- 'CODE_OF_CONDUCT.md'
29+
- 'BUILD.*'
30+
- 'WORKSPACE'
31+
- 'kokoro/*'
32+
- 'make-revision'
33+
- 'Android.mk'
34+
- '_config.yml'
35+
36+
permissions: read-all
2437

2538
jobs:
2639
linux:
2740
runs-on: ${{matrix.os.genus}}
41+
permissions:
42+
contents: write
2843
strategy:
2944
fail-fast: false
3045
matrix:
3146
os: [{genus: ubuntu-20.04, family: linux}]
3247
compiler: [{cc: clang, cxx: clang++}, {cc: gcc, cxx: g++}]
3348
cmake_build_type: [Debug, Release]
3449
steps:
35-
- uses: actions/checkout@v2
36-
- uses: actions/setup-python@v2
50+
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
51+
- uses: lukka/get-cmake@8be6cca406b575906541e8e3b885d46f416bba39 # v3.27.7
52+
- uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
3753
with:
3854
python-version: '3.7'
3955
- name: Install Ubuntu Package Dependencies
@@ -71,10 +87,11 @@ jobs:
7187
- name: Zip
7288
if: ${{ matrix.compiler.cc == 'clang' }}
7389
env:
74-
ARCHIVE: glslang-master-${{matrix.os.family}}-${{matrix.cmake_build_type}}.zip
90+
ARCHIVE: glslang-main-${{matrix.os.family}}-${{matrix.cmake_build_type}}.zip
7591
run: |
7692
cd build/install
7793
zip ${ARCHIVE} \
94+
bin/glslang \
7895
bin/glslangValidator \
7996
include/glslang/* \
8097
include/glslang/**/* \
@@ -92,24 +109,27 @@ jobs:
92109
- name: Deploy
93110
if: ${{ matrix.compiler.cc == 'clang' }}
94111
env:
95-
ARCHIVE: glslang-master-${{matrix.os.family}}-${{matrix.cmake_build_type}}.zip
96-
uses: actions/github-script@v5
112+
ARCHIVE: glslang-main-${{matrix.os.family}}-${{matrix.cmake_build_type}}.zip
113+
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
97114
with:
98115
script: |
99116
const script = require('.github/workflows/deploy.js')
100117
await script({github, context, core})
101118
102119
macos:
103120
runs-on: ${{matrix.os.genus}}
121+
permissions:
122+
contents: write
104123
strategy:
105124
fail-fast: false
106125
matrix:
107126
os: [{genus: macos-11, family: osx}]
108127
compiler: [{cc: clang, cxx: clang++}]
109128
cmake_build_type: [Debug, Release]
110129
steps:
111-
- uses: actions/checkout@v2
112-
- uses: actions/setup-python@v2
130+
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
131+
- uses: lukka/get-cmake@8be6cca406b575906541e8e3b885d46f416bba39 # v3.27.7
132+
- uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
113133
with:
114134
python-version: '3.7'
115135
- name: Install GoogleTest
@@ -142,10 +162,11 @@ jobs:
142162
cd ../Test && ./runtests
143163
- name: Zip
144164
env:
145-
ARCHIVE: glslang-master-${{matrix.os.family}}-${{matrix.cmake_build_type}}.zip
165+
ARCHIVE: glslang-main-${{matrix.os.family}}-${{matrix.cmake_build_type}}.zip
146166
run: |
147167
cd build/install
148168
zip ${ARCHIVE} \
169+
bin/glslang \
149170
bin/glslangValidator \
150171
include/glslang/* \
151172
include/glslang/**/* \
@@ -160,10 +181,102 @@ jobs:
160181
lib/libSPVRemapper.a \
161182
lib/libSPIRV-Tools.a \
162183
lib/libSPIRV-Tools-opt.a
184+
- name: Deploy
185+
env:
186+
ARCHIVE: glslang-main-${{matrix.os.family}}-${{matrix.cmake_build_type}}.zip
187+
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
188+
with:
189+
script: |
190+
const script = require('.github/workflows/deploy.js')
191+
await script({github, context, core})
192+
193+
windows:
194+
runs-on: ${{matrix.os.genus}}
195+
permissions:
196+
contents: write
197+
strategy:
198+
fail-fast: false
199+
matrix:
200+
os: [{genus: windows-2019, family: windows}]
201+
cmake_build_type: [Debug, Release]
202+
steps:
203+
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
204+
- uses: lukka/get-cmake@8be6cca406b575906541e8e3b885d46f416bba39 # v3.27.7
205+
- uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
206+
with:
207+
python-version: '3.7'
208+
- name: Install GoogleTest
209+
run: |
210+
# check out pre-breakage version of googletest; can be deleted when
211+
# issue 3128 is fixed
212+
# git clone --depth=1 https://github.com/google/googletest.git External/googletest
213+
mkdir -p External/googletest
214+
cd External/googletest
215+
git init
216+
git remote add origin https://github.com/google/googletest.git
217+
git fetch --depth 1 origin 0c400f67fcf305869c5fb113dd296eca266c9725
218+
git reset --hard FETCH_HEAD
219+
cd ../..
220+
- name: Update Glslang Sources
221+
run: |
222+
python update_glslang_sources.py
223+
- name: Build
224+
run: |
225+
cmake -S. -Bbuild -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX="$PWD/build/install"
226+
cmake --build build --config ${{matrix.cmake_build_type}} --target install
227+
- name: Test
228+
run: |
229+
cd build
230+
ctest -C ${{matrix.cmake_build_type}} --output-on-failure
231+
cd ../Test && bash runtests
232+
- name: Zip
233+
if: ${{ matrix.cmake_build_type == 'Debug' }}
234+
env:
235+
ARCHIVE: glslang-master-${{matrix.os.family}}-Debug.zip
236+
run: |
237+
cd build/install
238+
7z a ${{env.ARCHIVE}} `
239+
bin/glslang.exe `
240+
bin/glslangValidator.exe `
241+
bin/spirv-remap.exe `
242+
include/glslang/* `
243+
lib/GenericCodeGend.lib `
244+
lib/glslangd.lib `
245+
lib/glslang-default-resource-limitsd.lib `
246+
lib/HLSLd.lib `
247+
lib/MachineIndependentd.lib `
248+
lib/OGLCompilerd.lib `
249+
lib/OSDependentd.lib `
250+
lib/SPIRVd.lib `
251+
lib/SPVRemapperd.lib `
252+
lib/SPIRV-Toolsd.lib `
253+
lib/SPIRV-Tools-optd.lib
254+
- name: Zip
255+
if: ${{ matrix.cmake_build_type == 'Release' }}
256+
env:
257+
ARCHIVE: glslang-master-${{matrix.os.family}}-Release.zip
258+
run: |
259+
cd build/install
260+
7z a ${{env.ARCHIVE}} `
261+
bin/glslang.exe `
262+
bin/glslangValidator.exe `
263+
bin/spirv-remap.exe `
264+
include/glslang/* `
265+
lib/GenericCodeGen.lib `
266+
lib/glslang.lib `
267+
lib/glslang-default-resource-limits.lib `
268+
lib/HLSL.lib `
269+
lib/MachineIndependent.lib `
270+
lib/OGLCompiler.lib `
271+
lib/OSDependent.lib `
272+
lib/SPIRV.lib `
273+
lib/SPVRemapper.lib `
274+
lib/SPIRV-Tools.lib `
275+
lib/SPIRV-Tools-opt.lib
163276
- name: Deploy
164277
env:
165278
ARCHIVE: glslang-master-${{matrix.os.family}}-${{matrix.cmake_build_type}}.zip
166-
uses: actions/github-script@v5
279+
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
167280
with:
168281
script: |
169282
const script = require('.github/workflows/deploy.js')

0 commit comments

Comments
 (0)