Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1293)

Unified Diff: src/sksl/SkSLToken.h

Issue 2288033003: Turned on SkSL->GLSL compiler (Closed)
Patch Set: changed <iostream> to <ostream> Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/sksl/SkSLSPIRVCodeGenerator.cpp ('k') | src/sksl/SkSLUtil.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/sksl/SkSLToken.h
diff --git a/src/sksl/SkSLToken.h b/src/sksl/SkSLToken.h
index 29fa81e2e06ade7b9f8bddcef5567fafafb4ac69..b8a364c2691db6a368d78d32232bc8bd22469669 100644
--- a/src/sksl/SkSLToken.h
+++ b/src/sksl/SkSLToken.h
@@ -49,10 +49,11 @@ struct Token {
BITWISEOR,
BITWISEXOR,
BITWISEAND,
+ BITWISENOT,
LOGICALOR,
LOGICALXOR,
LOGICALAND,
- NOT,
+ LOGICALNOT,
QUESTION,
COLON,
EQ,
@@ -111,9 +112,11 @@ struct Token {
case Token::PERCENT: return "%";
case Token::SHL: return "<<";
case Token::SHR: return ">>";
+ case Token::LOGICALNOT: return "!";
case Token::LOGICALAND: return "&&";
case Token::LOGICALOR: return "||";
case Token::LOGICALXOR: return "^^";
+ case Token::BITWISENOT: return "~";
case Token::BITWISEAND: return "&";
case Token::BITWISEOR: return "|";
case Token::BITWISEXOR: return "^";
@@ -139,7 +142,6 @@ struct Token {
case Token::BITWISEXOREQ: return "^=";
case Token::PLUSPLUS: return "++";
case Token::MINUSMINUS: return "--";
- case Token::NOT: return "!";
default:
ABORT("unsupported operator: %d\n", kind);
}
« no previous file with comments | « src/sksl/SkSLSPIRVCodeGenerator.cpp ('k') | src/sksl/SkSLUtil.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698