GLSL/SPV: Fix #1196: Require resources to have layout(binding=X).

2018-02-21 18:19:49 -07:00
parent 2d9973de0e
commit 9c9c4e90df
20 changed files with 114 additions and 64 deletions
--- a/Test/baseResults/spv.debugInfo.frag.out
+++ b/Test/baseResults/spv.debugInfo.frag.out
@@ -11,6 +11,7 @@ spv.debugInfo.frag
               1:             String  "spv.debugInfo.frag"
                              Source GLSL 450 1  "// OpModuleProcessed no-storage-format
 // OpModuleProcessed resource-set-binding 3
+// OpModuleProcessed auto-map-bindings
 // OpModuleProcessed auto-map-locations
 // OpModuleProcessed client opengl100
 // OpModuleProcessed target-env opengl
@@ -95,7 +96,9 @@ void main()
                              MemberDecorate 54(ubuf) 0 Offset 0
                              Decorate 54(ubuf) Block
                              Decorate 56 DescriptorSet 3
+                              Decorate 56 Binding 0
                              Decorate 69(s2d) DescriptorSet 3
+                              Decorate 69(s2d) Binding 1
               3:             TypeVoid
               4:             TypeFunction 3
               7:             TypeInt 32 1