commit 7a95b20733b43575945ab619bf639f275ab01788
author Ethan Nicholas <ethannicholas@google.com> Fri Oct 09 11:55:40 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Oct 09 16:58:33 2020 +0000
tree 52dc098cc09cc74e1dcef892d6cf3a0706984b3f
parent a7a404473cc5f777d531b60a25144981acc3d4c5

moved SkSL FieldAccess data into IRNode

Change-Id: Ib2fd8c246799a1bde566395080fe6617754644f9
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/324635
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

src/sksl/SkSLIRGenerator.cpp

diff --git a/src/sksl/SkSLIRGenerator.cpp b/src/sksl/SkSLIRGenerator.cpp
index cefd107..ff9d2fd 100644
--- a/src/sksl/SkSLIRGenerator.cpp
+++ b/src/sksl/SkSLIRGenerator.cpp
@@ -836,9 +836,9 @@
     #define WREF(var) std::unique_ptr<Expression>(\
                                  new VariableReference(-1, var, VariableReference::RefKind::kWrite))
     #define FIELD(var, idx) std::unique_ptr<Expression>(\
-                    new FieldAccess(REF(var), idx, FieldAccess::kAnonymousInterfaceBlock_OwnerKind))
+                   new FieldAccess(REF(var), idx, FieldAccess::OwnerKind::kAnonymousInterfaceBlock))
     #define POS std::unique_ptr<Expression>(new FieldAccess(WREF(fSkPerVertex), 0, \
-                                                FieldAccess::kAnonymousInterfaceBlock_OwnerKind))
+                                                  FieldAccess::OwnerKind::kAnonymousInterfaceBlock))
     #define ADJUST (fRTAdjustInterfaceBlock ? \
                     FIELD(fRTAdjustInterfaceBlock, fRTAdjustFieldIndex) : \
                     REF(fRTAdjust))
@@ -1439,7 +1439,7 @@
                                                             VariableReference::RefKind::kRead);
             return std::make_unique<FieldAccess>(std::move(base),
                                                  field->fieldIndex(),
-                                                 FieldAccess::kAnonymousInterfaceBlock_OwnerKind);
+                                                 FieldAccess::OwnerKind::kAnonymousInterfaceBlock);
         }
         case Symbol::Kind::kType: {
             const Type* t = &result->as<Type>();