commit 077050b0190c196ca920c2ac69585ade42ab3a40
author Ethan Nicholas <ethannicholas@google.com> Tue Oct 13 10:30:20 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Oct 13 15:22:26 2020 +0000
tree e0defb6fc5243a20268887b696c81790de68e122
parent 4c412bce4cacf556fbf87e9e9066ba709bc671f9

moved SkSL ModifiersDeclaration data into IRNode

Change-Id: Iebe59b32a965e383d2b032258d7731645e0bd1a4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/325622
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>

src/sksl/SkSLSPIRVCodeGenerator.cpp

diff --git a/src/sksl/SkSLSPIRVCodeGenerator.cpp b/src/sksl/SkSLSPIRVCodeGenerator.cpp
index 9a328da..2fdc037 100644
--- a/src/sksl/SkSLSPIRVCodeGenerator.cpp
+++ b/src/sksl/SkSLSPIRVCodeGenerator.cpp
@@ -2717,7 +2717,7 @@
     if (intfModifiers.fLayout.fBuiltin == SK_IN_BUILTIN) {
         for (const auto& e : fProgram.elements()) {
             if (e->is<ModifiersDeclaration>()) {
-                const Modifiers& m = e->as<ModifiersDeclaration>().fModifiers;
+                const Modifiers& m = e->as<ModifiersDeclaration>().modifiers();
                 update_sk_in_count(m, &fSkInCount);
             }
         }
@@ -3094,7 +3094,7 @@
     int invocations = 1;
     for (const auto& e : fProgram.elements()) {
         if (e->is<ModifiersDeclaration>()) {
-            const Modifiers& m = e->as<ModifiersDeclaration>().fModifiers;
+            const Modifiers& m = e->as<ModifiersDeclaration>().modifiers();
             if (m.fFlags & Modifiers::kIn_Flag) {
                 if (m.fLayout.fInvocations != -1) {
                     invocations = m.fLayout.fInvocations;
@@ -3169,7 +3169,7 @@
                 break;
             }
             case ProgramElement::Kind::kModifiers: {
-                Modifiers& m = e->as<ModifiersDeclaration>().fModifiers;
+                const Modifiers& m = e->as<ModifiersDeclaration>().modifiers();
                 if (m.fFlags & Modifiers::kIn_Flag) {
                     switch (m.fLayout.fPrimitive) {
                         case Layout::kPoints_Primitive: // break