Skip to content

Commit 859f066

Browse files
spencer-lunargmattgodbolt
authored andcommitted
Update SPIR-V with newest Vulkan SDK (compiler-explorer#7300)
Adds new SPIR-V tools from new Vulkan SDK (compiler-explorer/infra#1498)
1 parent f1eca0a commit 859f066

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

etc/config/spirv.amazon.properties

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
compilers=&spirv-opt:&spirv-val:&spirv-cross
1+
compilers=&spirv-opt:&spirv-val:&spirv-cross:&spirv-reflect
22
defaultCompiler=spirv-opt-master
33

44
supportsBinary=false
@@ -17,15 +17,26 @@ group.spirv-val.compilerType=spirv-tools
1717

1818
group.spirv-cross.groupName=Translate
1919
group.spirv-cross.baseName=SPIRV-Cross
20-
group.spirv-cross.compilers=spirv-cross-sdk-296
20+
group.spirv-cross.compilers=spirv-cross-sdk-296:spirv-cross-sdk-304
2121
group.spirv-cross.compilerType=spirv-tools
2222

23+
group.spirv-reflect.groupName=Reflection
24+
group.spirv-reflect.baseName=SPIRV-Reflect
25+
group.spirv-reflect.compilers=spirv-reflect-sdk-304
26+
group.spirv-reflect.compilerType=spirv-tools
27+
2328
assemblerPath=/opt/compiler-explorer/SPIRV-Tools-master/build/tools/spirv-as
2429
disassemblerPath=/opt/compiler-explorer/SPIRV-Tools-master/build/tools/spirv-dis
2530
compiler.spirv-opt-master.exe=/opt/compiler-explorer/SPIRV-Tools-master/build/tools/spirv-opt
2631
compiler.spirv-opt-master.name=spirv-opt (trunk)
2732
compiler.spirv-val-master.exe=/opt/compiler-explorer/SPIRV-Tools-master/build/tools/spirv-val
2833
compiler.spirv-val-master.name=spirv-val (trunk)
2934

35+
# SPIRV-Reflect needed stdout fix not added until 304 SDK
3036
compiler.spirv-cross-sdk-296.exe=/opt/compiler-explorer/vulkan-sdk/v1.3.296.0/x86_64/bin/spirv-cross
3137
compiler.spirv-cross-sdk-296.name=spirv-cross (sdk-296)
38+
39+
compiler.spirv-cross-sdk-304.exe=/opt/compiler-explorer/vulkan-sdk/v1.4.304.0/x86_64/bin/spirv-cross
40+
compiler.spirv-cross-sdk-304.name=spirv-cross (sdk-304)
41+
compiler.spirv-reflect-sdk-304.exe=/opt/compiler-explorer/vulkan-sdk/v1.4.304.0/x86_64/bin/spirv-reflect
42+
compiler.spirv-reflect-sdk-304.name=spirv-reflect (sdk-304)

0 commit comments

Comments
 (0)