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

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

diff --git a/src/glsl/ast_type.cpp b/src/glsl/ast_type.cpp
index a4671e203e28f0128468959685da00885a538380..892122af03d04050bd24aa3dcb0275f5847c77a8 100644 (file)
--- a/src/glsl/ast_type.cpp
+++ b/src/glsl/ast_type.cpp
@@ -297,6 +297,11 @@ ast_type_qualifier::merge_qualifier(YYLTYPE *loc,
       this->image_base_type = q.image_base_type;
    }
 
+   if (q.flags.q.vk_set) {
+      this->set = q.set;
+      this->binding = q.binding;
+   }
+
    return true;
 }