Merge pull request #1030 from KhronosGroup/msl-2.2-invalid-test

MSL: Fix path check in test_shaders.py.
This commit is contained in:
Hans-Kristian Arntzen 2019-06-18 10:38:35 +02:00 committed by GitHub
commit e9ec5ce7b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -593,8 +593,10 @@ def test_shader_msl(stats, shader, args, paths):
# executable from Xcode using args: `--msl --entry main --output msl_path spirv_path`.
# print('SPRIV shader: ' + spirv)
shader_is_msl22 = 'msl22' in shader
shader_is_msl22 = 'msl22' in joined_path
skip_validation = shader_is_msl22 and (not args.msl22)
if '.invalid.' in joined_path:
skip_validation = True
if (not args.force_no_external_validation) and (not skip_validation):
validate_shader_msl(shader, args.opt)