Sort diagnostics according to their provoking location

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index e46e5401a8fbe452e8175cc622545d7f52caf6f7..9c1238c029eec1155957b105748ae078767a4437 100644 (file)
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -293,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;
@@ -300,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);

diff --git a/source/glsl/compiler.h b/source/glsl/compiler.h
index 6448ae6cfa6fe962dc5097ffcf2011f835ebbaf9..5104388870f5a22bbfff775d843ce9ab095f2bbf 100644 (file)
--- a/source/glsl/compiler.h
+++ b/source/glsl/compiler.h
@@ -133,6 +133,8 @@ private:
 
        bool validate(Stage &);
 
+       static bool diagnostic_line_order(const Diagnostic &, const Diagnostic &);
+
        /** Applies optimizations to a stage.  The return value indicates which
        stage should be optimized next. */
        OptimizeResult optimize(Stage &);