godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Merge pull request #28829 from vreon/swizzle-up

Browse Source 
Allow constructing larger data types by swizzling
This commit is contained in:
Rémi Verschelde
2019-05-24 17:02:26 +02:00
committed by GitHub
parent 521aad3dca 1b9d26765f
commit 193837a8f5
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
servers/visual/shader_language.cpp
View File

@@ -2968,6 +2968,10 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
member_type = DataType(dt - 1); member_type = DataType(dt - 1);
} else if (l == 2) { } else if (l == 2) {
member_type = dt; member_type = dt;
} else if (l == 3) {
member_type = DataType(dt + 1);
} else if (l == 4) {
member_type = DataType(dt + 2);
} else { } else {
ok = false; ok = false;
break; break;
@@ -3001,6 +3005,8 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
member_type = DataType(dt - 1); member_type = DataType(dt - 1);
} else if (l == 3) { } else if (l == 3) {
member_type = dt; member_type = dt;
} else if (l == 4) {
member_type = DataType(dt + 1);
} else { } else {
ok = false; ok = false;
break; break;