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

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index 7dbb501c..c5f0a9a3 100644
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -166,7 +166,8 @@ 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)
-			append(combined, "\n", format("%s:%d: %s", module->source_map.get_name(j->source), j->line, j->message));
+			if(j->source!=INTERNAL_SOURCE)
+				append(combined, "\n", format("%s:%d: %s", module->source_map.get_name(j->source), j->line, j->message));
 	return combined;
 }
 
@@ -174,7 +175,10 @@ void Compiler::append_module(Module &mod, DataFile::Collection *res)
 {
 	module->source_map.merge_from(mod.source_map);
 
-	vector<Import *> imports = NodeGatherer<Import>().apply(mod.shared);
+	vector<Import *> imports;
+	for(NodeList<Statement>::const_iterator i=mod.shared.content.body.begin(); i!=mod.shared.content.body.end(); ++i)
+		if(Import *imp = dynamic_cast<Import *>(i->get()))
+			imports.push_back(imp);
 	for(vector<Import *>::iterator i=imports.begin(); i!=imports.end(); ++i)
 		import(res, (*i)->module);
 	NodeRemover().apply(mod.shared, set<Node *>(imports.begin(), imports.end()));
@@ -272,13 +276,13 @@ void Compiler::resolve(Stage &stage, unsigned flags)
 		if(resolve<BlockHierarchyResolver>(stage, flags, RESOLVE_BLOCKS))
 			;
 		else if(resolve<TypeResolver>(stage, flags, RESOLVE_TYPES))
-			flags |= RESOLVE_VARIABLES|RESOLVE_EXPRESSIONS;
+			flags |= RESOLVE_BLOCKS|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;
+			flags |= RESOLVE_VARIABLES|RESOLVE_FUNCTIONS;
 	}
 }
 
@@ -289,6 +293,8 @@ bool Compiler::validate(Stage &stage)
 	ReferenceValidator().apply(stage);
 	ExpressionValidator().apply(stage);
 
+	stable_sort(stage.diagnostics, &diagnostic_line_order);
+
 	for(vector<Diagnostic>::const_iterator i=stage.diagnostics.begin(); i!=stage.diagnostics.end(); ++i)
 		if(i->severity==Diagnostic::ERR)
 			return false;
@@ -296,6 +302,21 @@ bool Compiler::validate(Stage &stage)
 	return true;
 }
 
+bool Compiler::diagnostic_line_order(const Diagnostic &diag1, const Diagnostic &diag2)
+{
+	if(diag1.provoking_source!=diag2.provoking_source)
+	{
+		// Sort builtins first and imported modules according to import order.
+		if(diag1.provoking_source<=BUILTIN_SOURCE)
+			return diag1.provoking_source<diag2.provoking_source;
+		else if(diag2.provoking_source<=BUILTIN_SOURCE)
+			return false;
+		else
+			return diag1.provoking_source>diag2.provoking_source;
+	}
+	return diag1.provoking_line<diag2.provoking_line;
+}
+
 Compiler::OptimizeResult Compiler::optimize(Stage &stage)
 {
 	ConstantConditionEliminator().apply(stage);
@@ -303,12 +324,12 @@ Compiler::OptimizeResult Compiler::optimize(Stage &stage)
 	bool any_inlined = false;
 	if(FunctionInliner().apply(stage))
 	{
-		resolve(stage, RESOLVE_TYPES|RESOLVE_VARIABLES|RESOLVE_EXPRESSIONS);
+		resolve(stage, RESOLVE_TYPES|RESOLVE_VARIABLES|RESOLVE_FUNCTIONS|RESOLVE_EXPRESSIONS);
 		any_inlined = true;
 	}
 	if(ExpressionInliner().apply(stage))
 	{
-		resolve(stage, RESOLVE_VARIABLES|RESOLVE_EXPRESSIONS);
+		resolve(stage, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS|RESOLVE_EXPRESSIONS);
 		any_inlined = true;
 	}