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

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index ac014a00..e46e5401 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))
@@ -311,7 +312,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;
 	}