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

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index 8caeba1f..f5540139 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);
@@ -274,6 +276,7 @@ Compiler::OptimizeResult Compiler::optimize(Stage &stage)
 	any_inlined |= ExpressionInliner().apply(stage);
 	if(any_inlined)
 	{
+		TypeResolver().apply(stage);
 		VariableResolver().apply(stage);
 		FunctionResolver().apply(stage);
 	}