X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;h=30a3f08c58a98b34cf10ffc8224540375978c69e;hb=6d11ee7d6137117f441951615cd4cde4d59bf968;hp=803862cb45787974a21a50628d9495009eb2fbca;hpb=1f09306906fbf57c05dccb27189264706cc64cfa;p=libs%2Fgl.git

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index 803862cb..30a3f08c 100644
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -1,5 +1,6 @@
 #include <msp/core/algorithm.h>
 #include <msp/strings/format.h>
+#include <msp/strings/utils.h>
 #include "builtin.h"
 #include "compatibility.h"
 #include "compiler.h"
@@ -85,7 +86,7 @@ void Compiler::compile(Mode mode)
 		throw invalid_shader_source(get_diagnostics());
 
 	unsigned n = 0;
-	for(list<Stage>::iterator i=module->stages.begin(); (i!=module->stages.end() && n<10000); ++n)
+	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++n)
 	{
 		OptimizeResult result = optimize(*i);
 		if(result==REDO_PREVIOUS)
@@ -165,7 +166,7 @@ string Compiler::get_diagnostics() const
 	string combined;
 	for(list<Stage>::const_iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
 		for(vector<Diagnostic>::const_iterator j=i->diagnostics.begin(); j!=i->diagnostics.end(); ++j)
-			combined += format("%s:%d: %s\n", module->source_map.get_name(j->source), j->line, j->message);
+			append(combined, "\n", format("%s:%d: %s", module->source_map.get_name(j->source), j->line, j->message));
 	return combined;
 }
 
@@ -205,13 +206,6 @@ 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)
@@ -238,17 +232,21 @@ void Compiler::generate(Stage &stage, Mode mode)
 	stage.required_features.gl_api = features.gl_api;
 	if(module->shared.required_features.glsl_version>stage.required_features.glsl_version)
 		stage.required_features.glsl_version = module->shared.required_features.glsl_version;
+
 	inject_block(stage.content, module->shared.content);
+	if(const Stage *builtins = get_builtins(stage.type))
+		inject_block(stage.content, builtins->content);
+	if(const Stage *builtins = get_builtins(Stage::SHARED))
+		inject_block(stage.content, builtins->content);
 
 	// Initial resolving pass
 	BlockHierarchyResolver().apply(stage);
-	FunctionResolver().apply(stage);
-	VariableResolver().apply(stage);
+	resolve(stage);
 
 	/* All variables local to a stage have been resolved.  Resolve non-local
 	variables through interfaces. */
 	InterfaceGenerator().apply(stage);
-	VariableResolver().apply(stage);
+	resolve(stage);
 
 	FunctionResolver().apply(stage);
 	ConstantSpecializer().apply(stage, (mode==PROGRAM && specialized ? &spec_values : 0));
@@ -256,9 +254,21 @@ void Compiler::generate(Stage &stage, Mode mode)
 		LegacyConverter().apply(stage, features);
 }
 
+void Compiler::resolve(Stage &stage)
+{
+	TypeResolver().apply(stage);
+	// Use the bitwise or to always evaluate both operands
+	while(VariableResolver().apply(stage) |
+		ExpressionResolver().apply(stage)) ;
+	FunctionResolver().apply(stage);
+}
+
 bool Compiler::validate(Stage &stage)
 {
+	TypeValidator().apply(stage);
 	DeclarationValidator().apply(stage);
+	ReferenceValidator().apply(stage);
+	ExpressionValidator().apply(stage);
 
 	for(vector<Diagnostic>::const_iterator i=stage.diagnostics.begin(); i!=stage.diagnostics.end(); ++i)
 		if(i->severity==Diagnostic::ERR)
@@ -274,15 +284,13 @@ Compiler::OptimizeResult Compiler::optimize(Stage &stage)
 	bool any_inlined = FunctionInliner().apply(stage);
 	any_inlined |= ExpressionInliner().apply(stage);
 	if(any_inlined)
-	{
-		VariableResolver().apply(stage);
-		FunctionResolver().apply(stage);
-	}
+		resolve(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);
+	any_removed |= UnusedTypeRemover().apply(stage);
 
 	return any_removed ? REDO_PREVIOUS : any_inlined ? REDO_STAGE : NEXT_STAGE;
 }