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

SkSL: Support bitwise negation on unsigned integers

Browse Source 
Change-Id: I5558891882923b4e554a8b97a87da6bc4386b645
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/243817
Commit-Queue: Brian Osman <brianosman@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Auto-Submit: Brian Osman <brianosman@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
This commit is contained in:
Brian Osman 2019-09-24 16:22:55 -04:00 committed by Skia Commit-Bot
parent 4524e84a74
commit 73fb39c9b0
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sksl/SkSLIRGenerator.cpp
View File

@ -2082,7 +2082,7 @@ std::unique_ptr<Expression> IRGenerator::convertPrefixExpression(const ASTNode&
}
break;
case Token::BITWISENOT:
if (base->fType != *fContext.fInt_Type) {
if (base->fType != *fContext.fInt_Type && base->fType != *fContext.fUInt_Type) {
fErrors.error(expression.fOffset,
String("'") + Compiler::OperatorName(expression.getToken().fKind) +
"' cannot operate on '" + base->fType.description() + "'");

9
tests/SkSLInterpreterTest.cpp
View File

@ -247,6 +247,15 @@ DEF_TEST(SkSLInterpreterBitwise, r) {
test(r, "void main(inout half4 color) { color.r = half(~int(color.r) & 3); }",
6, 0, 0, 0, 1, 0, 0, 0);
test(r, "void main(inout half4 color) { color.r = half(uint(color.r) | 3); }",
5, 0, 0, 0, 7, 0, 0, 0);
test(r, "void main(inout half4 color) { color.r = half(uint(color.r) & 3); }",
6, 0, 0, 0, 2, 0, 0, 0);
test(r, "void main(inout half4 color) { color.r = half(uint(color.r) ^ 3); }",
5, 0, 0, 0, 6, 0, 0, 0);
test(r, "void main(inout half4 color) { color.r = half(~uint(color.r) & 3); }",
6, 0, 0, 0, 1, 0, 0, 0);
// Shift operators
unsigned in = 0x80000011;
unsigned out;