Even more validation for uniform mismatches

[libs/gl.git] / source / glsl / syntax.h

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index 55823d34bb8acad73c17a1018f2c56804f8e7b7d..597a48e4b39bf47f8e78c9b781006238a071a167 100644 (file)
--- a/source/glsl/syntax.h
+++ b/source/glsl/syntax.h
@@ -96,6 +96,9 @@ class NodeContainer: public C
 public:
        NodeContainer() { }
        NodeContainer(const NodeContainer &);
+
+       void push_back_nocopy(const typename C::value_type &v)
+       { C::push_back(0); C::back() = v; }
 };
 
 template<typename T>
@@ -426,8 +429,9 @@ struct VariableDeclaration: Statement
 
 struct InterfaceBlock: Statement
 {
+       NodePtr<Layout> layout;
        std::string interface;
-       std::string name;
+       std::string block_name;
        NodePtr<Block> members;
        std::string instance_name;
        bool array;
@@ -545,7 +549,10 @@ struct Module
        Module();
 };
 
-std::string get_unused_variable_name(const Block &, const std::string &, const std::string &);
+std::string get_unused_variable_name(const Block &, const std::string &);
+
+bool is_same_type(const TypeDeclaration &, const TypeDeclaration &);
+int get_layout_value(const Layout &, const std::string &, int = -1);
 
 } // namespace SL
 } // namespace GL