X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;h=d5ee6691ff83cd3d877c845431ab9a29698c1edb;hb=0febee9a8fdf1f9b03d3f2e23e72f8194b3698c7;hp=803862cb45787974a21a50628d9495009eb2fbca;hpb=e195322eb1251f2eb0d6dfb8c2dc0fff02e5fcfc;p=libs%2Fgl.git diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp index 803862cb..d5ee6691 100644 --- a/source/glsl/compiler.cpp +++ b/source/glsl/compiler.cpp @@ -1,5 +1,6 @@ #include #include +#include #include "builtin.h" #include "compatibility.h" #include "compiler.h" @@ -165,7 +166,7 @@ string Compiler::get_diagnostics() const string combined; for(list::const_iterator i=module->stages.begin(); i!=module->stages.end(); ++i) for(vector::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; }