X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fparser.h;h=51616378c29c947653496ca71be80640081e55f4;hb=1a5dafe20e47c764f2914c341fb7b8f1fba59fb8;hp=e087f27f9d0578bd6e23be8fee0c44e841cd3cb3;hpb=f901fcf41d8ca544085f448227f84bc6f966660d;p=libs%2Fgl.git

diff --git a/source/glsl/parser.h b/source/glsl/parser.h
index e087f27f..51616378 100644
--- a/source/glsl/parser.h
+++ b/source/glsl/parser.h
@@ -25,9 +25,12 @@ private:
 	Preprocessor preprocessor;
 	bool allow_stage_change;
 	Module *module;
+	std::vector<const Module *> imported_modules;
 	Stage *cur_stage;
-	std::set<std::string> declared_types;
+	std::set<std::string> global_types;
+	std::set<std::string> stage_types;
 	std::vector<std::string> errors;
+	RefPtr<Statement> next_global_declaration;
 
 public:
 	Parser(ModuleCache *);
@@ -77,6 +80,7 @@ private:
 	RefPtr<BinaryExpression> parse_binary(const RefPtr<Expression> &, const Operator &);
 	RefPtr<TernaryExpression> parse_ternary(const RefPtr<Expression> &, const Operator &);
 	RefPtr<FunctionCall> parse_function_call(const VariableReference &);
+	void add_type(TypeDeclaration &);
 	RefPtr<TypeDeclaration> parse_type_declaration();
 	RefPtr<BasicTypeDeclaration> parse_basic_type_declaration();
 	RefPtr<ImageTypeDeclaration> parse_image_type_declaration();
@@ -84,7 +88,7 @@ private:
 	RefPtr<VariableDeclaration> parse_variable_declaration();
 	RefPtr<VariableDeclaration> parse_variable_declaration_with_layout();
 	RefPtr<FunctionDeclaration> parse_function_declaration();
-	RefPtr<InterfaceBlock> parse_interface_block();
+	RefPtr<StructDeclaration> parse_interface_block();
 	RefPtr<Conditional> parse_conditional();
 	RefPtr<Iteration> parse_for();
 	RefPtr<Iteration> parse_while();