X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;h=0f608d6d600313682577df96a3c7e2cccd2e5226;hb=9bec9da4ec633a541cf6048beed99629fefae2b9;hp=8caeba1fcf13c600759b7ed53ca790254759b4f1;hpb=69680f4d284cdf7b16a2966250a88ab1257862f3;p=libs%2Fgl.git

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index 8caeba1f..0f608d6d 100644
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -241,12 +241,14 @@ void Compiler::generate(Stage &stage, Mode mode)
 
 	// Initial resolving pass
 	BlockHierarchyResolver().apply(stage);
+	TypeResolver().apply(stage);
 	FunctionResolver().apply(stage);
 	VariableResolver().apply(stage);
 
 	/* All variables local to a stage have been resolved.  Resolve non-local
 	variables through interfaces. */
 	InterfaceGenerator().apply(stage);
+	TypeResolver().apply(stage);
 	VariableResolver().apply(stage);
 
 	FunctionResolver().apply(stage);
@@ -258,6 +260,7 @@ void Compiler::generate(Stage &stage, Mode mode)
 bool Compiler::validate(Stage &stage)
 {
 	DeclarationValidator().apply(stage);
+	ReferenceValidator().apply(stage);
 
 	for(vector<Diagnostic>::const_iterator i=stage.diagnostics.begin(); i!=stage.diagnostics.end(); ++i)
 		if(i->severity==Diagnostic::ERR)
@@ -274,6 +277,7 @@ Compiler::OptimizeResult Compiler::optimize(Stage &stage)
 	any_inlined |= ExpressionInliner().apply(stage);
 	if(any_inlined)
 	{
+		TypeResolver().apply(stage);
 		VariableResolver().apply(stage);
 		FunctionResolver().apply(stage);
 	}