AuroraMiddleware/SPIRV-Cross
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MSL: Update test scripts for MSL 3.1 testing.

Browse Source
This commit is contained in:
Hans-Kristian Arntzen 2023-11-28 14:25:51 +01:00
parent 9c054b1f34
commit 2ff08b31c0
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test_shaders.py
View File

@ -123,10 +123,12 @@ def msl_compiler_supports_version(version):
return False return False
def path_to_msl_standard(shader): def path_to_msl_standard(shader):
if '.ios.' in shader: if '.msl31.' in shader:
if '.msl3.' in shader: return '-std=metal3.1'
return '-std=metal3.0' elif '.msl3.' in shader:
elif '.msl2.' in shader: return '-std=metal3.0'
elif '.ios.' in shader:
if '.msl2.' in shader:
return '-std=ios-metal2.0' return '-std=ios-metal2.0'
elif '.msl21.' in shader: elif '.msl21.' in shader:
return '-std=ios-metal2.1' return '-std=ios-metal2.1'
@ -143,9 +145,7 @@ def path_to_msl_standard(shader):
else: else:
return '-std=ios-metal1.2' return '-std=ios-metal1.2'
else: else:
if '.msl3.' in shader: if '.msl2.' in shader:
return '-std=metal3.0'
elif '.msl2.' in shader:
return '-std=macos-metal2.0' return '-std=macos-metal2.0'
elif '.msl21.' in shader: elif '.msl21.' in shader:
return '-std=macos-metal2.1' return '-std=macos-metal2.1'
@ -161,7 +161,9 @@ def path_to_msl_standard(shader):
return '-std=macos-metal1.2' return '-std=macos-metal1.2'
def path_to_msl_standard_cli(shader): def path_to_msl_standard_cli(shader):
if '.msl3.' in shader: if '.msl31.' in shader:
return '30100'
elif '.msl3.' in shader:
return '30000' return '30000'
elif '.msl2.' in shader: elif '.msl2.' in shader:
return '20000' return '20000'
@ -1037,12 +1039,14 @@ def main():
args.msl23 = False args.msl23 = False
args.msl24 = False args.msl24 = False
args.msl30 = False args.msl30 = False
args.msl31 = False
if args.msl: if args.msl:
print_msl_compiler_version() print_msl_compiler_version()
args.msl22 = msl_compiler_supports_version('-std=macos-metal2.2') args.msl22 = msl_compiler_supports_version('-std=macos-metal2.2')
args.msl23 = msl_compiler_supports_version('-std=macos-metal2.3') args.msl23 = msl_compiler_supports_version('-std=macos-metal2.3')
args.msl24 = msl_compiler_supports_version('-std=macos-metal2.4') args.msl24 = msl_compiler_supports_version('-std=macos-metal2.4')
args.msl30 = msl_compiler_supports_version('-std=metal3.0') args.msl30 = msl_compiler_supports_version('-std=metal3.0')
args.msl31 = msl_compiler_supports_version('-std=metal3.1')
backend = 'glsl' backend = 'glsl'
if (args.msl or args.metal): if (args.msl or args.metal):