From 191610b71271a765c8056ef947b2b04b8bfa84b5 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Wed, 4 Jul 2018 02:22:56 +0300 Subject: [PATCH] Rearrange GLSL qualifier parsing GLSL 4.20 allows qualifiers to be in any order so there's no sense to enforce a particular order here. Always output them in a compatible order though. --- source/programparser.cpp | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/source/programparser.cpp b/source/programparser.cpp index f38f3909..80917ba3 100644 --- a/source/programparser.cpp +++ b/source/programparser.cpp @@ -449,7 +449,7 @@ RefPtr ProgramParser::parse_global_declaration() else if(is_interface_qualifier(token)) { string next = peek_token(1); - if(is_type(next) || is_precision_qualifier(next)) + if(is_type(next) || is_qualifier(next)) return parse_variable_declaration(); else return parse_interface_block(); @@ -718,25 +718,20 @@ RefPtr ProgramParser::parse_variable_declaration() RefPtr var = new VariableDeclaration; string token = peek_token(); - if(is_sampling_qualifier(token)) + while(is_qualifier(token)) { - var->sampling = parse_token(); - token = peek_token(); - if(!is_interface_qualifier(token)) - throw runtime_error(format_syntax_error("an interface qualifier")); - } - - if(is_interface_qualifier(token)) - var->interface = parse_token(); - else if(token=="const") - { - var->constant = true; parse_token(); + if(is_interface_qualifier(token)) + var->interface = token; + else if(is_sampling_qualifier(token)) + var->sampling = token; + else if(is_precision_qualifier(token)) + var->precision = token; + else if(token=="const") + var->constant = true; + token = peek_token(); } - if(is_precision_qualifier(token)) - var->precision = parse_token(); - var->type = expect_type(); var->name = expect_identifier(); -- 2.45.2