From f997bb32dadf45e071d73aed4e8272df614e42fd Mon Sep 17 00:00:00 2001 From: Alan Baker Date: Tue, 15 Jun 2021 11:11:58 -0400 Subject: [PATCH 1/2] Update known good SPIRV-Tools and SPIRV-Headers --- known_good.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/known_good.json b/known_good.json index d2b6ec2ce..177fab1db 100644 --- a/known_good.json +++ b/known_good.json @@ -5,14 +5,14 @@ "site" : "github", "subrepo" : "KhronosGroup/SPIRV-Tools", "subdir" : "External/spirv-tools", - "commit" : "fb02131cb4ac74a357bb53039ca3dd8926bb3b14" + "commit" : "4d22f58a812ea02e1ad53c9ccba12cb48f2bd0b2" }, { "name" : "spirv-tools/external/spirv-headers", "site" : "github", "subrepo" : "KhronosGroup/SPIRV-Headers", "subdir" : "External/spirv-tools/external/spirv-headers", - "commit" : "dafead1765f6c1a5f9f8a76387dcb2abe4e54acd" + "commit" : "f5417a4b6633c3217c9a1bc2f0c70b1454975ba7" } ] } From 3d9a31c6d1a454c72d933f060b4c4f0fbc06b8c7 Mon Sep 17 00:00:00 2001 From: Alan Baker Date: Tue, 15 Jun 2021 11:13:35 -0400 Subject: [PATCH 2/2] Update test expectations --- Test/baseResults/hlsl.attribute.expression.comp.out | 1 + Test/baseResults/hlsl.intrinsics.barriers.comp.out | 1 + Test/baseResults/hlsl.intrinsics.negative.comp.out | 1 + Test/baseResults/spv.subgroupUniformControlFlow.vert.out | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Test/baseResults/hlsl.attribute.expression.comp.out b/Test/baseResults/hlsl.attribute.expression.comp.out index bee8efe03..27775a685 100644 --- a/Test/baseResults/hlsl.attribute.expression.comp.out +++ b/Test/baseResults/hlsl.attribute.expression.comp.out @@ -81,6 +81,7 @@ local_size = (4, 6, 8) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int bound}) 0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float) +Validation failed // Module Version 10000 // Generated by (magic number): 8000a // Id's are bound by 39 diff --git a/Test/baseResults/hlsl.intrinsics.barriers.comp.out b/Test/baseResults/hlsl.intrinsics.barriers.comp.out index 9017d41f8..1ae95bca5 100644 --- a/Test/baseResults/hlsl.intrinsics.barriers.comp.out +++ b/Test/baseResults/hlsl.intrinsics.barriers.comp.out @@ -51,6 +51,7 @@ local_size = (1, 1, 1) 0:? Linker Objects 0:? '@entryPointOutput' (layout( location=0) out float) +Validation failed // Module Version 10000 // Generated by (magic number): 8000a // Id's are bound by 22 diff --git a/Test/baseResults/hlsl.intrinsics.negative.comp.out b/Test/baseResults/hlsl.intrinsics.negative.comp.out index ee88def1b..dfcaa2b99 100644 --- a/Test/baseResults/hlsl.intrinsics.negative.comp.out +++ b/Test/baseResults/hlsl.intrinsics.negative.comp.out @@ -179,6 +179,7 @@ local_size = (1, 1, 1) 0:? 'inF2' (layout( location=2) in 4-component vector of float) 0:? 'inI0' (layout( location=3) in 4-component vector of int) +Validation failed // Module Version 10000 // Generated by (magic number): 8000a // Id's are bound by 99 diff --git a/Test/baseResults/spv.subgroupUniformControlFlow.vert.out b/Test/baseResults/spv.subgroupUniformControlFlow.vert.out index 2a2722d3c..b7fce5a3c 100644 --- a/Test/baseResults/spv.subgroupUniformControlFlow.vert.out +++ b/Test/baseResults/spv.subgroupUniformControlFlow.vert.out @@ -1,7 +1,6 @@ spv.subgroupUniformControlFlow.vert WARNING: 0:7: '' : attribute with arguments not recognized, skipping -Validation failed // Module Version 10000 // Generated by (magic number): 8000a // Id's are bound by 6