| commit | 7df8fff2a3cad87826cc1db8f707c43aba4afdba | [log] [tgz] |
|---|---|---|
| author | Brian Osman <brianosman@google.com> | Wed May 29 14:33:57 2019 -0400 |
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | Wed May 29 19:02:21 2019 +0000 |
| tree | 4a611b89675d42ecce08413e542b9509cfbf2fe5 | |
| parent | e3bd673fbf46a5eb333307c5876cac607881c903 [diff] [blame] |
Avoid SkTMax in sksl Change-Id: Id549b9a398b7fe52b08b89c0d50db79953434ba5 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/216616 Auto-Submit: Brian Osman <brianosman@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
diff --git a/src/sksl/SkSLByteCodeGenerator.cpp b/src/sksl/SkSLByteCodeGenerator.cpp index 70052b6..6a88c85 100644 --- a/src/sksl/SkSLByteCodeGenerator.cpp +++ b/src/sksl/SkSLByteCodeGenerator.cpp
@@ -359,7 +359,7 @@ this->write(ByteCodeInstruction::kDup); } } - int count = SkTMax(SlotCount(lType), SlotCount(rType)); + int count = std::max(SlotCount(lType), SlotCount(rType)); switch (op) { case Token::Kind::EQEQ: this->writeTypedInstruction(b.fLeft->fType, ByteCodeInstruction::kCompareIEQ,