X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.cpp;fp=source%2Fglsl%2Fsyntax.cpp;h=2ab4d1b61a197b3ccee9ea849d60c990e8b2427b;hb=efbce87192ce73ba577684369f759693dccec67c;hp=40f6d4f660b24c84dff02a910951c71c87ad6c4e;hpb=ea844415db7fb7705ecbfea9cf27df2a8f00b802;p=libs%2Fgl.git diff --git a/source/glsl/syntax.cpp b/source/glsl/syntax.cpp index 40f6d4f6..2ab4d1b6 100644 --- 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, 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)