godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #55573 from Chaosus/shader_fix_xor

This commit is contained in:
Yuri Roubinsky 2021-12-03 11:37:50 +03:00 committed by GitHub
parent 1f666a972f 10b10ae1fa
commit 8bbea2a1a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
servers/rendering/shader_language.cpp
View File

@ -88,7 +88,8 @@ String ShaderLanguage::get_operator_text(Operator p_op) {
"--", "--",
"()", "()",
"construct", "construct",
"index" }; "index",
"empty" };
return op_names[p_op]; return op_names[p_op];
} }
@ -474,6 +475,10 @@ ShaderLanguage::Token ShaderLanguage::_get_token() {
case ':': case ':':
return _make_token(TK_COLON); return _make_token(TK_COLON);
case '^': case '^':
if (GETCHAR(0) == '=') {
char_idx++;
return _make_token(TK_OP_ASSIGN_BIT_XOR);
}
return _make_token(TK_OP_BIT_XOR); return _make_token(TK_OP_BIT_XOR);
case '~': case '~':
return _make_token(TK_OP_BIT_INVERT); return _make_token(TK_OP_BIT_INVERT);