Merge remote-tracking branch 'mesa-public/master' into vulkan

[mesa.git] / src / glsl / link_uniform_blocks.cpp

diff --git a/src/glsl/link_uniform_blocks.cpp b/src/glsl/link_uniform_blocks.cpp
index 4df39e200d5aa06d018cf911cf388ed0805ad748..b80e5736f6b54a2c96b680547b260520bd62d918 100644 (file)
--- a/src/glsl/link_uniform_blocks.cpp
+++ b/src/glsl/link_uniform_blocks.cpp
@@ -293,6 +293,8 @@ link_uniform_blocks(void *mem_ctx,
             blocks[i].NumUniforms =
                (unsigned)(ptrdiff_t)(&variables[parcel.index] - blocks[i].Uniforms);
 
+            blocks[i].Set = b->set;
+            blocks[i].Binding = b->binding;
             blocks[i].IsShaderStorage = b->is_shader_storage;
 
             i++;
@@ -313,6 +315,8 @@ link_uniform_blocks(void *mem_ctx,
          blocks[i].NumUniforms =
             (unsigned)(ptrdiff_t)(&variables[parcel.index] - blocks[i].Uniforms);
 
+         blocks[i].Set = b->set;
+         blocks[i].Binding = b->binding;
          blocks[i].IsShaderStorage = b->is_shader_storage;
 
          i++;