commit 77912983a319b8f7dede1e5e7ba7965ed99f80f2
author Chris Dalton <csmartdalton@google.com> Mon Dec 16 11:18:13 2019 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Dec 16 19:08:11 2019 +0000
tree ae492b2203fc2438f4c738b8292d0471071534eb
parent 2fe83fed9402e73fb824c2746f1da0fdcbeceda4

Include line numbers in Viewer's shader error windows

Change-Id: I83bea6e9c94431afba858b0e7b60456e8f9a2176
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260356
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

tools/viewer/Viewer.cpp

diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp
index f28337f..118de4e 100644
--- a/tools/viewer/Viewer.cpp
+++ b/tools/viewer/Viewer.cpp
@@ -23,6 +23,7 @@
 #include "src/gpu/GrContextPriv.h"
 #include "src/gpu/GrGpu.h"
 #include "src/gpu/GrPersistentCacheUtils.h"
+#include "src/gpu/GrShaderUtils.h"
 #include "src/gpu/ccpr/GrCoverageCountingPathRenderer.h"
 #include "src/utils/SkJSONWriter.h"
 #include "src/utils/SkOSPath.h"
@@ -2206,7 +2207,10 @@
         ImGui::Begin("Shader Errors");
         for (int i = 0; i < gShaderErrorHandler.fErrors.count(); ++i) {
             ImGui::TextWrapped("%s", gShaderErrorHandler.fErrors[i].c_str());
-            ImGui::TextWrapped("%s", gShaderErrorHandler.fShaders[i].c_str());
+            SkSL::String sksl(gShaderErrorHandler.fShaders[i].c_str());
+            GrShaderUtils::VisitLineByLine(sksl, [](int lineNumber, const char* lineText) {
+                ImGui::TextWrapped("%4i\t%s\n", lineNumber, lineText);
+            });
         }
         ImGui::End();
         gShaderErrorHandler.reset();