Improve layout qualifier handling with some more utility functions

[libs/gl.git] / source / glsl / syntax.cpp

diff --git a/source/glsl/syntax.cpp b/source/glsl/syntax.cpp
index 40f6d4f660b24c84dff02a910951c71c87ad6c4e..2ab4d1b61a197b3ccee9ea849d60c990e8b2427b 100644 (file)
--- a/source/glsl/syntax.cpp
+++ b/source/glsl/syntax.cpp
@@ -415,10 +415,27 @@ const TypeDeclaration *get_ultimate_base_type(const TypeDeclaration *type)
        return type;
 }
 
-int get_layout_value(const Layout &layout, const string &name, int def_value)
+bool has_layout_qualifier(const Layout *layout, const string &name)
 {
-       auto i = find_member(layout.qualifiers, name, &Layout::Qualifier::name);
-       return (i!=layout.qualifiers.end() ? i->value : def_value);
+       if(!layout)
+               return false;
+       auto i = find_member(layout->qualifiers, name, &Layout::Qualifier::name);
+       return i!=layout->qualifiers.end();
+}
+
+int get_layout_value(const Layout *layout, const string &name, int def_value)
+{
+       if(!layout)
+               return def_value;
+       auto i = find_member(layout->qualifiers, name, &Layout::Qualifier::name);
+       return (i!=layout->qualifiers.end() ? i->value : def_value);
+}
+
+void add_layout_qualifier(RefPtr<Layout> &layout, const Layout::Qualifier &q)
+{
+       if(!layout)
+               layout = new Layout;
+       layout->qualifiers.push_back(q);
 }
 
 void add_to_chain(Assignment::Target &target, Assignment::Target::ChainType type, unsigned index)