X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;h=9c1238c029eec1155957b105748ae078767a4437;hb=50a79aee4c53c4198bae38c7ff447133a043aacc;hp=ac014a00147bda31eef70d842c644cab3d27929d;hpb=cd01b904990d306eadd120f306b1d0ceb4d8f5c8;p=libs%2Fgl.git

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index ac014a00..9c1238c0 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;
 }
 
@@ -275,7 +276,7 @@ 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))
@@ -292,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;
@@ -299,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);
@@ -311,7 +329,7 @@ Compiler::OptimizeResult Compiler::optimize(Stage &stage)
 	}
 	if(ExpressionInliner().apply(stage))
 	{
-		resolve(stage, RESOLVE_VARIABLES|RESOLVE_EXPRESSIONS);
+		resolve(stage, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS|RESOLVE_EXPRESSIONS);
 		any_inlined = true;
 	}