commit a085a41b9db458b56557924f90ad2be9be8e8c70
author Brian Osman <brianosman@google.com> Thu Apr 25 09:44:43 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Apr 25 15:27:59 2019 +0000
tree 274d73c5d14a8a3b8273b9438d2602f011b7fd69
parent b8f81af5312d2fb4227a61e256de41e0cec6b66d

Normalize storage of shader strings in the cache

Adds a tag that can be used to verify the expected type
of shaders. My follow-up CL that adds SkSL editing to
Vulkan relies heavily on this.

Change-Id: Ifda420c2dcbaff07cdf1b8157d0ece02b1ab6c78
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/210262
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

tools/viewer/Viewer.h

diff --git a/tools/viewer/Viewer.h b/tools/viewer/Viewer.h
index 1c02e3a..8cc2f21 100644
--- a/tools/viewer/Viewer.h
+++ b/tools/viewer/Viewer.h
@@ -194,8 +194,9 @@
         sk_sp<const SkData> fKey;
         SkString            fKeyString;
 
-        SkSL::Program::Inputs fInputs;
-        SkSL::String fShader[kGrShaderTypeCount];
+        SkFourByteTag         fShaderType;
+        SkSL::String          fShader[kGrShaderTypeCount];
+        SkSL::Program::Inputs fInputs[kGrShaderTypeCount];
     };
 
     sk_gpu_test::MemoryCache fPersistentCache;