moved SkSL Variable data into IRNode

Change-Id: I53af66c1b65971c204ac7c515e0d0e39481b015d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/323097
Reviewed-by: Brian Osman <[email protected]>
Commit-Queue: Ethan Nicholas <[email protected]>

Author: Ethan Nicholas

src/core/SkRuntimeEffect.cpp

@@ -160,7 +160,7 @@ SkRuntimeEffect::EffectResult SkRuntimeEffect::Make(SkString sksl) {
             const SkSL::Type& varType = var.type();
 
             // Varyings (only used in conjunction with drawVertices)
-            if (var.fModifiers.fFlags & SkSL::Modifiers::kVarying_Flag) {
+            if (var.modifiers().fFlags & SkSL::Modifiers::kVarying_Flag) {
                 varyings.push_back({var.name(),
                                     varType.typeKind() == SkSL::Type::TypeKind::kVector
                                             ? varType.columns()
@@ -172,7 +172,7 @@ SkRuntimeEffect::EffectResult SkRuntimeEffect::Make(SkString sksl) {
                 sampleUsages.push_back(SkSL::Analysis::GetSampleUsage(*program, var));
             }
             // 'uniform' variables
-            else if (var.fModifiers.fFlags & SkSL::Modifiers::kUniform_Flag) {
+            else if (var.modifiers().fFlags & SkSL::Modifiers::kUniform_Flag) {
                 Uniform uni;
                 uni.fName = var.name();
                 uni.fFlags = 0;
@@ -189,7 +189,7 @@ SkRuntimeEffect::EffectResult SkRuntimeEffect::Make(SkString sksl) {
                     RETURN_FAILURE("Invalid uniform type: '%s'", type->displayName().c_str());
                 }
 
-                const SkSL::StringFragment& marker(var.fModifiers.fLayout.fMarker);
+                const SkSL::StringFragment& marker(var.modifiers().fLayout.fMarker);
                 if (marker.fLength) {
                     uni.fFlags |= Uniform::kMarker_Flag;
                     allowColorFilter = false;
@@ -199,7 +199,7 @@ SkRuntimeEffect::EffectResult SkRuntimeEffect::Make(SkString sksl) {
                     }
                 }
 
-                if (var.fModifiers.fLayout.fFlags & SkSL::Layout::Flag::kSRGBUnpremul_Flag) {
+                if (var.modifiers().fLayout.fFlags & SkSL::Layout::Flag::kSRGBUnpremul_Flag) {
                     uni.fFlags |= Uniform::kSRGBUnpremul_Flag;
                 }
 

src/sksl/SkSLAnalysis.cpp

@@ -139,7 +139,7 @@ class BuiltinVariableVisitor : public ProgramVisitor {
     bool visitExpression(const Expression& e) override {
         if (e.is<VariableReference>()) {
             const VariableReference& var = e.as<VariableReference>();
-            return var.fVariable->fModifiers.fLayout.fBuiltin == fBuiltin;
+            return var.fVariable->modifiers().fLayout.fBuiltin == fBuiltin;
         }
         return INHERITED::visitExpression(e);
     }
@@ -240,8 +240,8 @@ class IsAssignableVisitor {
             case Expression::Kind::kVariableReference: {
                 VariableReference& varRef = expr.as<VariableReference>();
                 const Variable* var = varRef.fVariable;
-                if (var->fModifiers.fFlags & (Modifiers::kConst_Flag | Modifiers::kUniform_Flag |
-                                              Modifiers::kVarying_Flag)) {
+                if (var->modifiers().fFlags & (Modifiers::kConst_Flag | Modifiers::kUniform_Flag |
+                                               Modifiers::kVarying_Flag)) {
                     fErrors->error(expr.fOffset,
                                    "cannot modify immutable variable '" + var->name() + "'");
                 } else if (fAssignableVar) {

src/sksl/SkSLAnalysis.h

@@ -21,7 +21,7 @@ struct FunctionDefinition;
 struct Program;
 struct ProgramElement;
 struct Statement;
-struct Variable;
+class Variable;
 struct VariableReference;
 
 /**

src/sksl/SkSLByteCodeGenerator.cpp

@@ -117,11 +117,11 @@ int ByteCodeGenerator::SlotCount(const Type& type) {
 }
 
 static inline bool is_uniform(const SkSL::Variable& var) {
-    return var.fModifiers.fFlags & Modifiers::kUniform_Flag;
+    return var.modifiers().fFlags & Modifiers::kUniform_Flag;
 }
 
 static inline bool is_in(const SkSL::Variable& var) {
-    return var.fModifiers.fFlags & Modifiers::kIn_Flag;
+    return var.modifiers().fFlags & Modifiers::kIn_Flag;
 }
 
 void ByteCodeGenerator::gatherUniforms(const Type& type, const String& name) {
@@ -165,7 +165,7 @@ bool ByteCodeGenerator::generateCode() {
                 if (declVar->type() == *fContext.fFragmentProcessor_Type) {
                     fOutput->fChildFPCount++;
                 }
-                if (declVar->fModifiers.fLayout.fBuiltin >= 0 || is_in(*declVar)) {
+                if (declVar->modifiers().fLayout.fBuiltin >= 0 || is_in(*declVar)) {
                     continue;
                 }
                 if (is_uniform(*declVar)) {
@@ -218,8 +218,8 @@ std::unique_ptr<ByteCodeFunction> ByteCodeGenerator::writeFunction(const Functio
 static int expression_as_builtin(const Expression& e) {
     if (e.is<VariableReference>()) {
         const Variable& var(*e.as<VariableReference>().fVariable);
-        if (var.fStorage == Variable::kGlobal_Storage) {
-            return var.fModifiers.fLayout.fBuiltin;
+        if (var.storage() == Variable::kGlobal_Storage) {
+            return var.modifiers().fLayout.fBuiltin;
         }
     }
     return -1;
@@ -423,7 +423,7 @@ int ByteCodeGenerator::StackUsage(ByteCodeInstruction inst, int count_) {
 ByteCodeGenerator::Location ByteCodeGenerator::getLocation(const Variable& var) {
     // given that we seldom have more than a couple of variables, linear search is probably the most
     // efficient way to handle lookups
-    switch (var.fStorage) {
+    switch (var.storage()) {
         case Variable::kLocal_Storage: {
             for (int i = fLocals.size() - 1; i >= 0; --i) {
                 if (fLocals[i] == &var) {
@@ -486,7 +486,7 @@ ByteCodeGenerator::Location ByteCodeGenerator::getLocation(const Variable& var)
                 if (e.is<GlobalVarDeclaration>()) {
                     const GlobalVarDeclaration& decl = e.as<GlobalVarDeclaration>();
                     const Variable* declVar = decl.fDecl->fVar;
-                    if (declVar->fModifiers.fLayout.fBuiltin >= 0 || is_in(*declVar)) {
+                    if (declVar->modifiers().fLayout.fBuiltin >= 0 || is_in(*declVar)) {
                         continue;
                     }
                     if (isUniform != is_uniform(*declVar)) {
@@ -1265,7 +1265,7 @@ void ByteCodeGenerator::writeFunctionCall(const FunctionCall& f) {
     for (int i = 0; i < argCount; ++i) {
         const auto& param = f.function().fParameters[i];
         const auto& arg = f.arguments()[i];
-        if (param->fModifiers.fFlags & Modifiers::kOut_Flag) {
+        if (param->modifiers().fFlags & Modifiers::kOut_Flag) {
             lvalues.emplace_back(this->getLValue(*arg));
             lvalues.back()->load();
         } else {
@@ -1298,7 +1298,7 @@ void ByteCodeGenerator::writeFunctionCall(const FunctionCall& f) {
     for (int i = argCount - 1; i >= 0; --i) {
         const auto& param = f.function().fParameters[i];
         const auto& arg = f.arguments()[i];
-        if (param->fModifiers.fFlags & Modifiers::kOut_Flag) {
+        if (param->modifiers().fFlags & Modifiers::kOut_Flag) {
             pop();
             lvalues.back()->store(true);
             lvalues.pop_back();
@@ -1834,7 +1834,7 @@ ByteCodeFunction::ByteCodeFunction(const FunctionDeclaration* declaration)
     fParameterCount = 0;
     for (const auto& p : declaration->fParameters) {
         int slots = ByteCodeGenerator::SlotCount(p->type());
-        fParameters.push_back({ slots, (bool)(p->fModifiers.fFlags & Modifiers::kOut_Flag) });
+        fParameters.push_back({ slots, (bool)(p->modifiers().fFlags & Modifiers::kOut_Flag) });
         fParameterCount += slots;
     }
 }