X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fparser.h;h=9ab1232aaa0d9ad7aec82b24ee873b8b4e998e16;hb=30465dd3b9f55ec42c4b19c3c2077eede7237a26;hp=cdb57ebc5b48850bae81f4af251e5a841b669504;hpb=1083ad150c902bd153f88f7fb28660b4f31cf9fe;p=libs%2Fgl.git

diff --git a/source/glsl/parser.h b/source/glsl/parser.h
index cdb57ebc..9ab1232a 100644
--- a/source/glsl/parser.h
+++ b/source/glsl/parser.h
@@ -41,6 +41,7 @@ private:
 
 	std::string expect_type();
 	std::string expect_identifier();
+	int expect_integer();
 	bool check(const std::string &);
 
 	static bool is_interface_qualifier(const std::string &);
@@ -63,12 +64,14 @@ private:
 	RefPtr<Import> parse_import();
 	RefPtr<Precision> parse_precision();
 	RefPtr<Layout> parse_layout();
-	void parse_block(Block &, bool);
+	template<typename T>
+	void parse_block(Block &, bool, RefPtr<T> (Parser::*)());
 	RefPtr<Expression> parse_expression(unsigned = 0);
 	RefPtr<BinaryExpression> parse_binary(const RefPtr<Expression> &, const Operator *);
 	RefPtr<FunctionCall> parse_function_call(const VariableReference &);
 	RefPtr<StructDeclaration> parse_struct_declaration();
 	RefPtr<VariableDeclaration> parse_variable_declaration();
+	RefPtr<VariableDeclaration> parse_variable_declaration_with_layout();
 	RefPtr<FunctionDeclaration> parse_function_declaration();
 	RefPtr<InterfaceBlock> parse_interface_block();
 	RefPtr<Conditional> parse_conditional();