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

[mesa.git] / src / glsl / ast.h

diff --git a/src/glsl/ast.h b/src/glsl/ast.h
index d8c6cea7832574bc11d3badf544e42f12cf3dab9..eb6d84616711b2a71438ec4afd8a155e7b32ab9c 100644 (file)
--- a/src/glsl/ast.h
+++ b/src/glsl/ast.h
@@ -527,6 +527,9 @@ struct ast_type_qualifier {
          unsigned explicit_stream:1; /**< stream value assigned explicitly by shader code */
          /** \} */
 
+         /** \name Vulkan qualifiers */
+         unsigned vk_set:1;
+
         /** \name Layout qualifiers for GL_ARB_tessellation_shader */
         /** \{ */
         /* tess eval input layout */
@@ -639,6 +642,11 @@ struct ast_type_qualifier {
     */
    glsl_base_type image_base_type;
 
+   /**
+    * Vulkan descriptor set
+    */
+   int set;
+
    /**
     * Return true if and only if an interpolation qualifier is present.
     */