From 863ea235bb3d0e5dec620c7e3ce9f44644d6418b Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Wed, 1 Jul 2020 07:18:57 -0600 Subject: [PATCH] SPIRV-Tools and tests: Update to location-validation in SPIRV-Tools. This introduces five new "Validation failures": - baseResults/hlsl.semantic.vert: issue with gl_ClipDistance/CullDistance - baseResults/spv.430.vert: issue gl_ClipDistance - baseResults/spv.450.tesc: still unknown - baseResults/spv.dataOut.frag: gl_FragData should not be supported, problem with front end - baseResults/spv.meshShaderPerViewUserDefined.mesh: seems okay, maybe a problem with SPIRV-Tools --- Test/baseResults/hlsl.semantic.vert.out | 1 + Test/baseResults/spv.430.vert.out | 1 + Test/baseResults/spv.450.tesc.out | 1 + Test/baseResults/spv.dataOut.frag.out | 1 + Test/baseResults/spv.meshShaderPerViewUserDefined.mesh.out | 1 + known_good.json | 2 +- 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Test/baseResults/hlsl.semantic.vert.out b/Test/baseResults/hlsl.semantic.vert.out index d13b294b..c17969a5 100644 --- a/Test/baseResults/hlsl.semantic.vert.out +++ b/Test/baseResults/hlsl.semantic.vert.out @@ -209,6 +209,7 @@ Shader version: 500 0:? '@entryPointOutput.clip1' ( out 2-element array of float ClipDistance) 0:? '@entryPointOutput.cull1' ( out 2-element array of float CullDistance) +Validation failed // Module Version 10000 // Generated by (magic number): 8000a // Id's are bound by 70 diff --git a/Test/baseResults/spv.430.vert.out b/Test/baseResults/spv.430.vert.out index 9e1877a1..a6b2e34c 100644 --- a/Test/baseResults/spv.430.vert.out +++ b/Test/baseResults/spv.430.vert.out @@ -1,4 +1,5 @@ spv.430.vert +Validation failed // Module Version 10000 // Generated by (magic number): 8000a // Id's are bound by 66 diff --git a/Test/baseResults/spv.450.tesc.out b/Test/baseResults/spv.450.tesc.out index 4abc3dd0..c18ab3ff 100644 --- a/Test/baseResults/spv.450.tesc.out +++ b/Test/baseResults/spv.450.tesc.out @@ -1,4 +1,5 @@ spv.450.tesc +Validation failed // Module Version 10000 // Generated by (magic number): 8000a // Id's are bound by 45 diff --git a/Test/baseResults/spv.dataOut.frag.out b/Test/baseResults/spv.dataOut.frag.out index 7030f633..980d1bd3 100644 --- a/Test/baseResults/spv.dataOut.frag.out +++ b/Test/baseResults/spv.dataOut.frag.out @@ -1,4 +1,5 @@ spv.dataOut.frag +Validation failed // Module Version 10000 // Generated by (magic number): 8000a // Id's are bound by 20 diff --git a/Test/baseResults/spv.meshShaderPerViewUserDefined.mesh.out b/Test/baseResults/spv.meshShaderPerViewUserDefined.mesh.out index e9eaed3f..26e86240 100644 --- a/Test/baseResults/spv.meshShaderPerViewUserDefined.mesh.out +++ b/Test/baseResults/spv.meshShaderPerViewUserDefined.mesh.out @@ -1,4 +1,5 @@ spv.meshShaderPerViewUserDefined.mesh +Validation failed // Module Version 10000 // Generated by (magic number): 8000a // Id's are bound by 108 diff --git a/known_good.json b/known_good.json index 9846b115..9b874644 100644 --- a/known_good.json +++ b/known_good.json @@ -5,7 +5,7 @@ "site" : "github", "subrepo" : "KhronosGroup/SPIRV-Tools", "subdir" : "External/spirv-tools", - "commit" : "e128ab0d624ce7beb08eb9656bb260c597a46d0a" + "commit" : "a1fb255a2a6856bba1e5a8486469ac93fca518c2" }, { "name" : "spirv-tools/external/spirv-headers",