glsl: add ast/parser support for subroutine parsing storage (v3.2)

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

diff --git a/src/glsl/ast_type.cpp b/src/glsl/ast_type.cpp
index d96e6a0e84dc215a72f13d9b4ea091f9752bf1d9..a4671e203e28f0128468959685da00885a538380 100644 (file)
--- a/src/glsl/ast_type.cpp
+++ b/src/glsl/ast_type.cpp
@@ -40,7 +40,12 @@ ast_type_specifier::print(void) const
 bool
 ast_fully_specified_type::has_qualifiers() const
 {
-   return this->qualifier.flags.i != 0;
+   /* 'subroutine' isnt a real qualifier. */
+   ast_type_qualifier subroutine_only;
+   subroutine_only.flags.i = 0;
+   subroutine_only.flags.q.subroutine = 1;
+   subroutine_only.flags.q.subroutine_def = 1;
+   return (this->qualifier.flags.i & ~subroutine_only.flags.i) != 0;
 }
 
 bool ast_type_qualifier::has_interpolation() const