]> git.tdb.fi Git - libs/gl.git/commitdiff
Recognize the samplerCubeArray type in shaders
authorMikko Rasa <tdb@tdb.fi>
Tue, 23 Jul 2019 08:07:29 +0000 (11:07 +0300)
committerMikko Rasa <tdb@tdb.fi>
Tue, 23 Jul 2019 08:07:29 +0000 (11:07 +0300)
The actual extension will be added a bit later.

source/programparser.cpp

index 7477f38bc9a6ad01d1f0182ed2429caaa6f49d39..83a2879f4feeaa92ba5e947149b45064b134ae44 100644 (file)
@@ -343,7 +343,7 @@ bool ProgramParser::is_qualifier(const string &token)
 
 bool ProgramParser::is_builtin_type(const string &token)
 {
 
 bool ProgramParser::is_builtin_type(const string &token)
 {
-       static Regex re("^(void|float|int|bool|[ib]?vec[234]|mat[234](x[234])?|sampler((1D|2D)(Array)?(Shadow)?|Cube(Shadow)?|3D))$");
+       static Regex re("^(void|float|int|bool|[ib]?vec[234]|mat[234](x[234])?|sampler((1D|2D|Cube)(Array)?(Shadow)?|3D))$");
        return re.match(token);
 }
 
        return re.match(token);
 }