From: gregory <gregory.hainaut@gmail.com>
Date: Fri, 6 Jul 2012 19:48:59 +0000 (+0200)
Subject: glsl edit: grep multiline error/warning messages
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;ds=sidebyside;h=f2329b671e784c326b8268186101f965be72202b;p=apitrace

glsl edit: grep multiline error/warning messages

Useful for GL shader errors which spawn multiple lines error message like that:
    >> 2135: warning: Vertex shader failed to compile with the following errors:
    >> ERROR: 1:1: error(#132) Syntax error: 'sdfsafasf' parse error
    >> ERROR: error(#273) 1 compilation errors.  No code generated
---

diff --git a/gui/retracer.cpp b/gui/retracer.cpp
index 69dca6c..bbe638c 100644
--- a/gui/retracer.cpp
+++ b/gui/retracer.cpp
@@ -406,6 +406,14 @@ void Retracer::run()
             error.type = regexp.cap(2);
             error.message = regexp.cap(3);
             errors.append(error);
+        } else if (!errors.isEmpty()) {
+            // Probably a multiligne message
+            ApiTraceError &previous = errors.last();
+            if (line.endsWith("\n")) {
+                line.chop(1);
+            }
+            previous.message.append('\n');
+            previous.message.append(line);
         }
     }