X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;h=7dbb501c777bd177b53e9ba37229913e5f07fd92;hp=30a3f08c58a98b34cf10ffc8224540375978c69e;hb=c1d3a1d7c1997bc71a30af2e2c25cb4a2b66784b;hpb=4414f0245005c8cfcd02b51ea394d612cc5776c4

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index 30a3f08c..7dbb501c 100644
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -240,27 +240,46 @@ void Compiler::generate(Stage &stage, Mode mode)
 		inject_block(stage.content, builtins->content);
 
 	// Initial resolving pass
-	BlockHierarchyResolver().apply(stage);
 	resolve(stage);
 
 	/* All variables local to a stage have been resolved.  Resolve non-local
 	variables through interfaces. */
 	InterfaceGenerator().apply(stage);
-	resolve(stage);
+	resolve(stage, RESOLVE_BLOCKS|RESOLVE_TYPES|RESOLVE_VARIABLES);
 
-	FunctionResolver().apply(stage);
 	ConstantSpecializer().apply(stage, (mode==PROGRAM && specialized ? &spec_values : 0));
 	if(mode==PROGRAM)
+	{
 		LegacyConverter().apply(stage, features);
+		resolve(stage, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS);
+	}
 }
 
-void Compiler::resolve(Stage &stage)
+template<typename T>
+bool Compiler::resolve(Stage &stage, unsigned &flags, unsigned bit)
 {
-	TypeResolver().apply(stage);
-	// Use the bitwise or to always evaluate both operands
-	while(VariableResolver().apply(stage) |
-		ExpressionResolver().apply(stage)) ;
-	FunctionResolver().apply(stage);
+	if(!(flags&bit))
+		return false;
+
+	flags &= ~bit;
+	return T().apply(stage);
+}
+
+void Compiler::resolve(Stage &stage, unsigned flags)
+{
+	while(flags)
+	{
+		if(resolve<BlockHierarchyResolver>(stage, flags, RESOLVE_BLOCKS))
+			;
+		else if(resolve<TypeResolver>(stage, flags, RESOLVE_TYPES))
+			flags |= RESOLVE_VARIABLES|RESOLVE_EXPRESSIONS;
+		else if(resolve<VariableResolver>(stage, flags, RESOLVE_VARIABLES))
+			flags |= RESOLVE_EXPRESSIONS;
+		else if(resolve<FunctionResolver>(stage, flags, RESOLVE_FUNCTIONS))
+			flags |= RESOLVE_EXPRESSIONS;
+		else if(resolve<ExpressionResolver>(stage, flags, RESOLVE_EXPRESSIONS))
+			flags |= RESOLVE_VARIABLES;
+	}
 }
 
 bool Compiler::validate(Stage &stage)
@@ -281,10 +300,17 @@ Compiler::OptimizeResult Compiler::optimize(Stage &stage)
 {
 	ConstantConditionEliminator().apply(stage);
 
-	bool any_inlined = FunctionInliner().apply(stage);
-	any_inlined |= ExpressionInliner().apply(stage);
-	if(any_inlined)
-		resolve(stage);
+	bool any_inlined = false;
+	if(FunctionInliner().apply(stage))
+	{
+		resolve(stage, RESOLVE_TYPES|RESOLVE_VARIABLES|RESOLVE_EXPRESSIONS);
+		any_inlined = true;
+	}
+	if(ExpressionInliner().apply(stage))
+	{
+		resolve(stage, RESOLVE_VARIABLES|RESOLVE_EXPRESSIONS);
+		any_inlined = true;
+	}
 
 	/* Removing variables or functions may cause things from the previous stage
 	to become unused. */