X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.h;h=4d30ee04c24684557eade28e639f70b4fdee6295;hb=f901fcf41d8ca544085f448227f84bc6f966660d;hp=f7c8ed29cedc09229be11f5ce774d78f67107ee3;hpb=d8bdf61007978e2c3670a22a58e2f105e8347537;p=libs%2Fgl.git

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index f7c8ed29..4d30ee04 100644
--- a/source/glsl/syntax.h
+++ b/source/glsl/syntax.h
@@ -187,6 +187,7 @@ struct MemberAccess: Expression
 	std::string member;
 
 	VariableDeclaration *declaration;
+	int index;
 
 	MemberAccess();
 	MemberAccess(const MemberAccess &);
@@ -313,6 +314,9 @@ struct Layout: Node
 		std::string name;
 		bool has_value;
 		int value;
+
+		Qualifier(const std::string &n = std::string()): name(n), has_value(false), value(0) { }
+		Qualifier(const std::string &n, int v): name(n), has_value(true), value(v) { }
 	};
 
 	std::vector<Qualifier> qualifiers;
@@ -353,6 +357,7 @@ struct BasicTypeDeclaration: TypeDeclaration
 
 	Kind kind;
 	unsigned size;
+	bool sign;
 	std::string base;
 
 	TypeDeclaration *base_type;
@@ -429,6 +434,7 @@ struct VariableDeclaration: Statement
 
 struct InterfaceBlock: Statement
 {
+	NodePtr<Layout> layout;
 	std::string interface;
 	std::string block_name;
 	NodePtr<Block> members;
@@ -531,6 +537,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;
 
@@ -550,6 +558,9 @@ struct Module
 
 std::string get_unused_variable_name(const Block &, const std::string &);
 
+int get_layout_value(const Layout &, const std::string &, int = -1);
+void add_to_chain(Assignment::Target &, Assignment::Target::ChainType, unsigned);
+
 } // namespace SL
 } // namespace GL
 } // namespace Msp