X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;h=1eeb36252ba899a8f8851798f2a393a1223cc05d;hb=d5c7c7f0b15c407b3da2184936e6deed18554c6a;hp=a18b8e8c2c3df57e0f26c2d126719edbaced8fb5;hpb=6288c42adde9ee7d39a47de51fa2856cf965dccc;p=libs%2Fgl.git

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index a18b8e8c..1eeb3625 100644
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -1,6 +1,7 @@
 #include <msp/core/algorithm.h>
 #include <msp/gl/extensions/ext_gpu_shader4.h>
 #include <msp/strings/format.h>
+#include "builtin.h"
 #include "compatibility.h"
 #include "compiler.h"
 #include "debug.h"
@@ -75,11 +76,13 @@ void Compiler::compile(Mode mode)
 {
 	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
 		generate(*i, mode);
-	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); )
+	unsigned n = 0;
+	for(list<Stage>::iterator i=module->stages.begin(); (i!=module->stages.end() && n<10000); ++n)
 	{
-		if(optimize(*i))
+		OptimizeResult result = optimize(*i);
+		if(result==REDO_PREVIOUS)
 			i = module->stages.begin();
-		else
+		else if(result!=REDO_STAGE)
 			++i;
 	}
 	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
@@ -185,6 +188,13 @@ void Compiler::append_stage(Stage &stage)
 		target = &*i;
 	}
 
+	if(target->content.body.empty())
+	{
+		Stage *builtins = get_builtins(stage.type);
+		if(builtins && builtins!=&stage)
+			append_stage(*builtins);
+	}
+
 	if(stage.required_features.glsl_version>target->required_features.glsl_version)
 		target->required_features.glsl_version = stage.required_features.glsl_version;
 	for(NodeList<Statement>::iterator i=stage.content.body.begin(); i!=stage.content.body.end(); ++i)
@@ -213,31 +223,39 @@ void Compiler::generate(Stage &stage, Mode mode)
 		stage.required_features.glsl_version = module->shared.required_features.glsl_version;
 	inject_block(stage.content, module->shared.content);
 
-	DeclarationReorderer().apply(stage);
-	BlockResolver().apply(stage);
+	// Initial resolving pass
+	BlockHierarchyResolver().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);
 	VariableResolver().apply(stage);
-	DeclarationReorderer().apply(stage);
+
 	FunctionResolver().apply(stage);
 	ConstantSpecializer().apply(stage, (mode==PROGRAM && specialized ? &spec_values : 0));
 	if(mode==PROGRAM)
 		LegacyConverter().apply(stage, features);
 }
 
-bool Compiler::optimize(Stage &stage)
+Compiler::OptimizeResult Compiler::optimize(Stage &stage)
 {
 	ConstantConditionEliminator().apply(stage);
 
-	FunctionInliner().apply(stage);
-	BlockResolver().apply(stage);
-	VariableResolver().apply(stage);
+	bool any_inlined = FunctionInliner().apply(stage);
+	if(any_inlined)
+	{
+		VariableResolver().apply(stage);
+		FunctionResolver().apply(stage);
+	}
 
-	bool result = UnusedVariableRemover().apply(stage);
-	result |= UnusedFunctionRemover().apply(stage);
+	/* Removing variables or functions may cause things from the previous stage
+	to become unused. */
+	bool any_removed = UnusedVariableRemover().apply(stage);
+	any_removed |= UnusedFunctionRemover().apply(stage);
 
-	return result;
+	return any_removed ? REDO_PREVIOUS : any_inlined ? REDO_STAGE : NEXT_STAGE;
 }
 
 void Compiler::finalize(Stage &stage, Mode mode)