commit 03b92cd66771d745d77a23b6837672fb2da9e0ed
author John Stiles <johnstiles@google.com> Wed Jun 24 11:01:08 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jun 24 15:34:53 2020 +0000
tree b84c41e11b6cc82352de7a36434cabfb5a7d7fee
parent 72e576492ccf085a6db988bc732adbd8a3aa4698

Fix crash in Viewer when attempting to view shaders in Metal.

Change-Id: Ia19063f13e74d7dc2f1ead1fad20ad6828a3648d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/298742
Commit-Queue: John Stiles <johnstiles@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

tools/viewer/Viewer.cpp

diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp
index 973171a..ec69093 100644
--- a/tools/viewer/Viewer.cpp
+++ b/tools/viewer/Viewer.cpp
@@ -2297,7 +2297,8 @@
 
                     SkSL::String highlight;
                     if (!sksl) {
-                        highlight = shaderCaps->versionDeclString();
+                        const char* versionDecl = shaderCaps->versionDeclString();
+                        highlight = versionDecl ? versionDecl : "";
                         if (shaderCaps->usesPrecisionModifiers()) {
                             highlight.append("precision mediump float;\n");
                         }