X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.h;h=66fed6e83f058d83b476d777a45cb43947703c72;hb=03d9003072e85c934f5624329fb4a34db8763db2;hp=6129421133b0d02ccb416758cf105758a956b01d;hpb=22d5405729048ee2677a1e45e309e6328de64a26;p=libs%2Fgl.git

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index 61294211..66fed6e8 100644
--- 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>
@@ -184,6 +187,7 @@ struct MemberAccess: Expression
 	std::string member;
 
 	VariableDeclaration *declaration;
+	int index;
 
 	MemberAccess();
 	MemberAccess(const MemberAccess &);
@@ -310,6 +314,8 @@ struct Layout: Node
 		std::string name;
 		bool has_value;
 		int value;
+
+		Qualifier(): has_value(false), value(0) { }
 	};
 
 	std::vector<Qualifier> qualifiers;
@@ -426,8 +432,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;
@@ -528,6 +535,8 @@ struct Stage
 	std::map<std::string, InterfaceBlock *> interface_blocks;
 	std::map<std::string, FunctionDeclaration *> functions;
 	std::map<std::string, unsigned> locations;
+	std::map<std::string, unsigned> texture_bindings;
+	std::map<std::string, unsigned> uniform_block_bindings;
 	Features required_features;
 	std::vector<Diagnostic> diagnostics;
 
@@ -547,6 +556,9 @@ struct Module
 
 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
 } // namespace Msp