commit 401a009aaae93d243c5e1ae7273ccd569627f232
author Brian Osman <brianosman@google.com> Thu Sep 10 14:47:24 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Sep 10 19:30:02 2020 +0000
tree 2acf82052132e35967eae22cb579ae2b09142980
parent ff9dc8240e3c6820e457a154872d410579887184

Clean up SkSL operator utility functions

We had two copies of IsAssignment. Move everything into Compiler, with
consistent parameter names, etc...

Change-Id: Icc91da69075f4d20cac9b1a7328b717b05984b3f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/316223
Auto-Submit: Brian Osman <brianosman@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/sksl/SkSLSPIRVCodeGenerator.cpp

diff --git a/src/sksl/SkSLSPIRVCodeGenerator.cpp b/src/sksl/SkSLSPIRVCodeGenerator.cpp
index 2bfe407..da91466 100644
--- a/src/sksl/SkSLSPIRVCodeGenerator.cpp
+++ b/src/sksl/SkSLSPIRVCodeGenerator.cpp
@@ -2325,7 +2325,7 @@
 
     std::unique_ptr<LValue> lvalue;
     SpvId lhs;
-    if (is_assignment(b.fOperator)) {
+    if (Compiler::IsAssignment(b.fOperator)) {
         lvalue = this->getLValue(*b.fLeft, out);
         lhs = lvalue->load(out);
     } else {
@@ -2333,7 +2333,8 @@
         lhs = this->writeExpression(*b.fLeft, out);
     }
     SpvId rhs = this->writeExpression(*b.fRight, out);
-    SpvId result = this->writeBinaryExpression(b.fLeft->fType, lhs, remove_assignment(b.fOperator),
+    SpvId result = this->writeBinaryExpression(b.fLeft->fType, lhs,
+                                               Compiler::RemoveAssignment(b.fOperator),
                                                b.fRight->fType, rhs, b.fType, out);
     if (lvalue) {
         lvalue->store(result, out);