Update to newest SPIRV-Tools. It checks the Vulkan rule that all resources must have a set and binding decoration, which many tests fail. So add code to set a default value of zero. Also disable PCH for Ninja builds.

2018-12-11 20:53:59 -06:00
parent 00054da5e6
commit 0a93cfbb79
234 changed files with 1259 additions and 15 deletions
--- a/Test/baseLegalResults/hlsl.aliasOpaque.frag.out
+++ b/Test/baseLegalResults/hlsl.aliasOpaque.frag.out
@@ -14,7 +14,9 @@ hlsl.aliasOpaque.frag
                              Name 51  "gtex"
                              Name 62  "@entryPointOutput"
                              Decorate 47(gss) DescriptorSet 0
+                              Decorate 47(gss) Binding 0
                              Decorate 51(gtex) DescriptorSet 0
+                              Decorate 51(gtex) Binding 0
                              Decorate 62(@entryPointOutput) Location 0
               2:             TypeVoid
               3:             TypeFunction 2
--- a/Test/baseLegalResults/hlsl.flattenOpaque.frag.out
+++ b/Test/baseLegalResults/hlsl.flattenOpaque.frag.out
@@ -16,9 +16,13 @@ hlsl.flattenOpaque.frag
                              Name 100  "s2.tex"
                              Name 120  "@entryPointOutput"
                              Decorate 38(tex) DescriptorSet 0
+                              Decorate 38(tex) Binding 0
                              Decorate 82(s.s2D) DescriptorSet 0
+                              Decorate 82(s.s2D) Binding 0
                              Decorate 97(s2.s2D) DescriptorSet 0
+                              Decorate 97(s2.s2D) Binding 0
                              Decorate 100(s2.tex) DescriptorSet 0
+                              Decorate 100(s2.tex) Binding 0
                              Decorate 120(@entryPointOutput) Location 0
               2:             TypeVoid
               3:             TypeFunction 2
--- a/Test/baseLegalResults/hlsl.flattenOpaqueInit.vert.out
+++ b/Test/baseLegalResults/hlsl.flattenOpaqueInit.vert.out
@@ -13,7 +13,9 @@ hlsl.flattenOpaqueInit.vert
                              Name 47  "g_tInputTexture"
                              Name 80  "@entryPointOutput"
                              Decorate 43(g_tInputTexture_sampler) DescriptorSet 0
+                              Decorate 43(g_tInputTexture_sampler) Binding 0
                              Decorate 47(g_tInputTexture) DescriptorSet 0
+                              Decorate 47(g_tInputTexture) Binding 0
                              Decorate 80(@entryPointOutput) Location 0
               2:             TypeVoid
               3:             TypeFunction 2
--- a/Test/baseLegalResults/hlsl.flattenOpaqueInitMix.vert.out
+++ b/Test/baseLegalResults/hlsl.flattenOpaqueInitMix.vert.out
@@ -13,7 +13,9 @@ hlsl.flattenOpaqueInitMix.vert
                              Name 47  "g_tInputTexture"
                              Name 57  "@entryPointOutput"
                              Decorate 44(g_tInputTexture_sampler) DescriptorSet 0
+                              Decorate 44(g_tInputTexture_sampler) Binding 0
                              Decorate 47(g_tInputTexture) DescriptorSet 0
+                              Decorate 47(g_tInputTexture) Binding 0
                              Decorate 57(@entryPointOutput) Location 0
               2:             TypeVoid
               3:             TypeFunction 2
--- a/Test/baseLegalResults/hlsl.flattenSubset.frag.out
+++ b/Test/baseLegalResults/hlsl.flattenSubset.frag.out
@@ -15,7 +15,9 @@ hlsl.flattenSubset.frag
                              Name 47  "vpos"
                              Name 50  "@entryPointOutput"
                              Decorate 21(samp) DescriptorSet 0
+                              Decorate 21(samp) Binding 0
                              Decorate 33(tex) DescriptorSet 0
+                              Decorate 33(tex) Binding 0
                              Decorate 47(vpos) Location 0
                              Decorate 50(@entryPointOutput) Location 0
               2:             TypeVoid