asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
commit 193837a8f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show stats 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;