X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogramsyntax.h;h=6a03f40fab67b2f4b02d17de5873587edf1d3e88;hp=9e64c4c7e86896192748cefb24e29b2333ca1787;hb=d901696935a6bf9fdad6ac8abe65ffab79bd297d;hpb=a5772e203cc30ce3b449614d03a293fd5b5985ad diff --git a/source/programsyntax.h b/source/programsyntax.h index 9e64c4c7..6a03f40f 100644 --- a/source/programsyntax.h +++ b/source/programsyntax.h @@ -7,6 +7,10 @@ #include #include #include "extension.h" +#include "uniform.h" + +#pragma push_macro("interface") +#undef interface namespace Msp { namespace GL { @@ -191,6 +195,7 @@ struct Layout: Node { struct Qualifier { + // TODO the standard calls this name, not identifier std::string identifier; std::string value; }; @@ -225,6 +230,7 @@ struct VariableDeclaration: Node { bool constant; std::string sampling; + std::string interpolation; std::string interface; std::string precision; std::string type; @@ -399,4 +405,6 @@ struct Module } // namespace GL } // namespace Msp +#pragma pop_macro("interface") + #endif