commit eaf4788a7566226fee8b4a7add3470c8eddb7d53
author Ethan Nicholas <ethannicholas@google.com> Thu Oct 15 10:10:08 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Oct 15 15:20:06 2020 +0000
tree 8ab19dd7a06840e3fbcbfdd9330b79eccc1dcbaa
parent 41fc174d7967b85594fe8205a964d882fd1aea37

moved SkSL InterfaceBlock data into IRNode

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

src/sksl/SkSLIRGenerator.cpp

diff --git a/src/sksl/SkSLIRGenerator.cpp b/src/sksl/SkSLIRGenerator.cpp
index 8a5d42d..1b20c73 100644
--- a/src/sksl/SkSLIRGenerator.cpp
+++ b/src/sksl/SkSLIRGenerator.cpp
@@ -774,7 +774,7 @@
     const Variable* skPerVertex = nullptr;
     if (const ProgramElement* perVertexDecl = fIntrinsics->find(Compiler::PERVERTEX_NAME)) {
         SkASSERT(perVertexDecl->is<InterfaceBlock>());
-        skPerVertex = perVertexDecl->as<InterfaceBlock>().fVariable;
+        skPerVertex = &perVertexDecl->as<InterfaceBlock>().variable();
     }
 
     // sk_Position = float4(sk_Position.xy * rtAdjust.xz + sk_Position.ww * rtAdjust.yw,
@@ -2835,7 +2835,7 @@
                     initialValue = decl.value().get();
                 } else {
                     SkASSERT(clonedDecl->is<InterfaceBlock>());
-                    sharedVar = clonedDecl->as<InterfaceBlock>().fVariable;
+                    sharedVar = &clonedDecl->as<InterfaceBlock>().variable();
                 }
 
                 // Now clone the Variable, and add the clone to the Program's symbol table.
@@ -2852,7 +2852,7 @@
                     GlobalVarDeclaration& global = clonedDecl->as<GlobalVarDeclaration>();
                     global.declaration()->as<VarDeclaration>().setVar(clonedVar);
                 } else {
-                    clonedDecl->as<InterfaceBlock>().fVariable = clonedVar;
+                    clonedDecl->as<InterfaceBlock>().setVariable(clonedVar);
                 }
 
                 // Remember this new re-mapping...