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

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index 8caeba1f..2a71cfe4 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);
@@ -257,7 +259,9 @@ void Compiler::generate(Stage &stage, Mode mode)
 
 bool Compiler::validate(Stage &stage)
 {
+	TypeValidator().apply(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 +278,7 @@ Compiler::OptimizeResult Compiler::optimize(Stage &stage)
 	any_inlined |= ExpressionInliner().apply(stage);
 	if(any_inlined)
 	{
+		TypeResolver().apply(stage);
 		VariableResolver().apply(stage);
 		FunctionResolver().apply(stage);
 	}
@@ -282,6 +287,7 @@ Compiler::OptimizeResult Compiler::optimize(Stage &stage)
 	to become unused. */
 	bool any_removed = UnusedVariableRemover().apply(stage);
 	any_removed |= UnusedFunctionRemover().apply(stage);
+	any_removed |= UnusedTypeRemover().apply(stage);
 
 	return any_removed ? REDO_PREVIOUS : any_inlined ? REDO_STAGE : NEXT_STAGE;
 }