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/SkSLMetalCodeGenerator.cpp

diff --git a/src/sksl/SkSLMetalCodeGenerator.cpp b/src/sksl/SkSLMetalCodeGenerator.cpp
index 67d5e8b..4d81c35 100644
--- a/src/sksl/SkSLMetalCodeGenerator.cpp
+++ b/src/sksl/SkSLMetalCodeGenerator.cpp
@@ -726,9 +726,9 @@
 }
 
 void MetalCodeGenerator::writeFieldAccess(const FieldAccess& f) {
-    const Type::Field* field = &f.fBase->type().fields()[f.fFieldIndex];
-    if (FieldAccess::kDefault_OwnerKind == f.fOwnerKind) {
-        this->writeExpression(*f.fBase, kPostfix_Precedence);
+    const Type::Field* field = &f.base()->type().fields()[f.fieldIndex()];
+    if (FieldAccess::OwnerKind::kDefault == f.ownerKind()) {
+        this->writeExpression(*f.base(), kPostfix_Precedence);
         this->write(".");
     }
     switch (field->fModifiers.fLayout.fBuiltin) {
@@ -739,7 +739,7 @@
             if (field->fName == "sk_PointSize") {
                 this->write("_out->sk_PointSize");
             } else {
-                if (FieldAccess::kAnonymousInterfaceBlock_OwnerKind == f.fOwnerKind) {
+                if (FieldAccess::OwnerKind::kAnonymousInterfaceBlock == f.ownerKind()) {
                     this->write("_globals->");
                     this->write(fInterfaceBlockNameMap[fInterfaceBlockMap[field]]);
                     this->write("->");
@@ -1692,10 +1692,10 @@
         }
         case Expression::Kind::kFieldAccess: {
             const FieldAccess& f = e->as<FieldAccess>();
-            if (FieldAccess::kAnonymousInterfaceBlock_OwnerKind == f.fOwnerKind) {
+            if (FieldAccess::OwnerKind::kAnonymousInterfaceBlock == f.ownerKind()) {
                 return kGlobals_Requirement;
             }
-            return this->requirements(f.fBase.get());
+            return this->requirements(f.base().get());
         }
         case Expression::Kind::kSwizzle:
             return this->requirements(e->as<Swizzle>().fBase.get());