Add a utility class for switching renderables

[libs/gl.git] / source / programparser.cpp

diff --git a/source/programparser.cpp b/source/programparser.cpp
index f38f39097615c94185c0d4bf7504d70e0dc7d646..b3a226fc98c55d2d9ceed2f39e9e498b4c68a71a 100644 (file)
--- a/source/programparser.cpp
+++ b/source/programparser.cpp
@@ -318,6 +318,11 @@ bool ProgramParser::is_sampling_qualifier(const string &token)
        return token=="centroid";
 }
 
+bool ProgramParser::is_interpolation_qualifier(const string &token)
+{
+       return (token=="smooth" || token=="flat" || token=="noperspective");
+}
+
 bool ProgramParser::is_precision_qualifier(const string &token)
 {
        return (token=="highp" || token=="mediump" || token=="lowp");
@@ -325,7 +330,11 @@ bool ProgramParser::is_precision_qualifier(const string &token)
 
 bool ProgramParser::is_qualifier(const string &token)
 {
-       return (token=="const" || is_interface_qualifier(token) || is_sampling_qualifier(token) || is_precision_qualifier(token));
+       return (token=="const" ||
+               is_interface_qualifier(token) ||
+               is_sampling_qualifier(token) ||
+               is_interpolation_qualifier(token) ||
+               is_precision_qualifier(token));
 }
 
 bool ProgramParser::is_builtin_type(const string &token)
@@ -449,7 +458,7 @@ RefPtr<Node> 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 +727,22 @@ RefPtr<VariableDeclaration> ProgramParser::parse_variable_declaration()
        RefPtr<VariableDeclaration> 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_interpolation_qualifier(token))
+                       var->interpolation = 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();