From 75cbfcc278195359f44ff9a217a2ef6d46b0bb6f Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Thu, 15 Nov 2018 09:57:43 -0700 Subject: [PATCH] Update to latest SPIR-V Tools. --- Test/baseResults/hlsl.structarray.flatten.frag.out | 5 +++++ Test/baseResults/spv.functionNestedOpaque.vert.out | 5 +++++ known_good.json | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Test/baseResults/hlsl.structarray.flatten.frag.out b/Test/baseResults/hlsl.structarray.flatten.frag.out index 411f1558..0756a528 100644 --- a/Test/baseResults/hlsl.structarray.flatten.frag.out +++ b/Test/baseResults/hlsl.structarray.flatten.frag.out @@ -155,6 +155,11 @@ gl_FragCoord origin is upper left 0:? 'g_texdata_array2[2].nonopaque_thing' ( uniform int) 0:? 'ps_output.color' (layout( location=0) out 4-component vector of float) +error: SPIRV-Tools Validation Errors +error: From Vulkan spec, section 14.5.2: +Variables identified with the UniformConstant storage class are used only as handles to refer to opaque resources. Such variables must be typed as OpTypeImage, OpTypeSampler, OpTypeSampledImage, OpTypeAccelerationStructureNV, or an array of one of these types. + %g_texdata_nonopaque_thing = OpVariable %_ptr_UniformConstant_int UniformConstant + // Module Version 10000 // Generated by (magic number): 80007 // Id's are bound by 80 diff --git a/Test/baseResults/spv.functionNestedOpaque.vert.out b/Test/baseResults/spv.functionNestedOpaque.vert.out index 34ae7c3f..31938f80 100644 --- a/Test/baseResults/spv.functionNestedOpaque.vert.out +++ b/Test/baseResults/spv.functionNestedOpaque.vert.out @@ -1,4 +1,9 @@ spv.functionNestedOpaque.vert +error: SPIRV-Tools Validation Errors +error: From Vulkan spec, section 14.5.2: +Variables identified with the UniformConstant storage class are used only as handles to refer to opaque resources. Such variables must be typed as OpTypeImage, OpTypeSampler, OpTypeSampledImage, OpTypeAccelerationStructureNV, or an array of one of these types. + %si = OpVariable %_ptr_UniformConstant_S UniformConstant + // Module Version 10000 // Generated by (magic number): 80007 // Id's are bound by 39 diff --git a/known_good.json b/known_good.json index 28aafdc9..0bfa88a7 100755 --- a/known_good.json +++ b/known_good.json @@ -5,7 +5,7 @@ "site" : "github", "subrepo" : "KhronosGroup/SPIRV-Tools", "subdir" : "External/spirv-tools", - "commit" : "9d699f6d4038f432c55310d5d0b4a6d507c1b686" + "commit" : "a29a9947ac96d811b310f481b24e293f67fedf32" }, { "name" : "spirv-tools/external/spirv-headers",