Bug fix - vk::binding on structured buffers (#720)

* Fix output of binding of structured buffer on GLSL.

* Added test to check vk binding is coming thru.

* Fix closethit binding inconsistency.

1 files changed, 21 insertions, 1 deletions

diff --git a/source/slang/emit.cpp b/source/slang/emit.cpp
index 644725fa8..8038561d0 100644
--- a/source/slang/emit.cpp
+++ b/source/slang/emit.cpp
@@ -5951,8 +5951,28 @@ struct EmitVisitor
         // TODO: we should require either the extension or the version...
         requireGLSLVersion(430);
 
-        emit("layout(std430) buffer ");
+        Emit("layout(std430");
 
+        auto layout = getVarLayout(ctx, varDecl);
+        if (layout)
+        {
+            LayoutResourceKind kind = LayoutResourceKind::DescriptorTableSlot;
+            EmitVarChain chain(layout);
+
+            const UInt index = getBindingOffset(&chain, kind);
+            const UInt space = getBindingSpace(&chain, kind);
+
+            Emit(", binding = ");
+            Emit(index);
+            if (space)
+            {
+                Emit(", set = ");
+                Emit(space);
+            }
+        }
+        
+        emit(") buffer ");
+    
         // Generate a dummy name for the block
         emit("_S");
         Emit(ctx->shared->uniqueIDCounter++);