From 3805671ce842b90b5c8dd25288a46fd15d997d4a Mon Sep 17 00:00:00 2001 From: David Neto Date: Tue, 15 Dec 2020 12:09:50 -0500 Subject: [PATCH 1/2] Update known_good, pick up ImageRead result validation Pick up https://github.com/KhronosGroup/SPIRV-Tools/pull/4072 which validates the result type of OpImageRead. This also requires test expectation updates. See #2486 tracks the needed upate to Glslang code generation. --- known_good.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/known_good.json b/known_good.json index 65d4376d..a01735ba 100644 --- a/known_good.json +++ b/known_good.json @@ -5,7 +5,7 @@ "site" : "github", "subrepo" : "KhronosGroup/SPIRV-Tools", "subdir" : "External/spirv-tools", - "commit" : "b27b1afd12d05bf238ac7368bb49de73cd620a8e" + "commit" : "ad898cb9498c65cac7c5b6f9ebddb610bd0852ad" }, { "name" : "spirv-tools/external/spirv-headers", From 1ef5e20290e55634e6e18dfb3c6207f502771fb8 Mon Sep 17 00:00:00 2001 From: David Neto Date: Tue, 15 Dec 2020 12:19:00 -0500 Subject: [PATCH 2/2] Test updates for ImageRead result type validation See #2486 --- Test/baseResults/hlsl.rw.register.frag.out | 1 + Test/baseResults/hlsl.rw.scalar.bracket.frag.out | 1 + Test/baseResults/hlsl.rw.vec2.bracket.frag.out | 1 + Test/baseResults/spv.rw.autoassign.frag.out | 1 + 4 files changed, 4 insertions(+) diff --git a/Test/baseResults/hlsl.rw.register.frag.out b/Test/baseResults/hlsl.rw.register.frag.out index 35b47583..7bcecc9f 100644 --- a/Test/baseResults/hlsl.rw.register.frag.out +++ b/Test/baseResults/hlsl.rw.register.frag.out @@ -97,6 +97,7 @@ gl_FragCoord origin is upper left 0:? 'g_tBuf1du1' (layout( binding=3 r32ui) uniform uimageBuffer) 0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) +Validation failed // Module Version 10000 // Generated by (magic number): 8000a // Id's are bound by 42 diff --git a/Test/baseResults/hlsl.rw.scalar.bracket.frag.out b/Test/baseResults/hlsl.rw.scalar.bracket.frag.out index 2c670753..06146770 100644 --- a/Test/baseResults/hlsl.rw.scalar.bracket.frag.out +++ b/Test/baseResults/hlsl.rw.scalar.bracket.frag.out @@ -1689,6 +1689,7 @@ gl_FragCoord origin is upper left 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4, uniform float uf1, uniform int ui1, uniform uint uu1}) 0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) +Validation failed // Module Version 10000 // Generated by (magic number): 8000a // Id's are bound by 571 diff --git a/Test/baseResults/hlsl.rw.vec2.bracket.frag.out b/Test/baseResults/hlsl.rw.vec2.bracket.frag.out index 093665c4..68e40de8 100644 --- a/Test/baseResults/hlsl.rw.vec2.bracket.frag.out +++ b/Test/baseResults/hlsl.rw.vec2.bracket.frag.out @@ -1707,6 +1707,7 @@ gl_FragCoord origin is upper left 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4, uniform 2-component vector of float uf2, uniform 2-component vector of int ui2, uniform 2-component vector of uint uu2}) 0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) +Validation failed // Module Version 10000 // Generated by (magic number): 8000a // Id's are bound by 605 diff --git a/Test/baseResults/spv.rw.autoassign.frag.out b/Test/baseResults/spv.rw.autoassign.frag.out index 43adeddf..c696c525 100644 --- a/Test/baseResults/spv.rw.autoassign.frag.out +++ b/Test/baseResults/spv.rw.autoassign.frag.out @@ -1,4 +1,5 @@ spv.rw.autoassign.frag +Validation failed // Module Version 10000 // Generated by (magic number): 8000a // Id's are bound by 42