AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid SkTMax in sksl

Browse Source 
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>
This commit is contained in:
Brian Osman 2019-05-29 14:33:57 -04:00 committed by Skia Commit-Bot
parent e3bd673fbf
commit 7df8fff2a3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sksl/SkSLByteCodeGenerator.cpp
View File

@ -359,7 +359,7 @@ void ByteCodeGenerator::writeBinaryExpression(const BinaryExpression& b) {
this->write(ByteCodeInstruction::kDup); this->write(ByteCodeInstruction::kDup);
} }
} }
int count = SkTMax(SlotCount(lType), SlotCount(rType)); int count = std::max(SlotCount(lType), SlotCount(rType));
switch (op) { switch (op) {
case Token::Kind::EQEQ: case Token::Kind::EQEQ:
this->writeTypedInstruction(b.fLeft->fType, ByteCodeInstruction::kCompareIEQ, this->writeTypedInstruction(b.fLeft->fType, ByteCodeInstruction::kCompareIEQ,