Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-02 14:41:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #35986 from Chaosus/shader_index

Browse source 
Allow non-constants for indexing builtin types in shaders
This commit is contained in:
Rémi Verschelde 2020-02-07 20:45:57 +01:00 • committed by GitHub
commit cdce912de7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
servers/visual/shader_language.cpp
View file

@ -3301,9 +3301,6 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
_set_error("Index out of range (0-1)"); _set_error("Index out of range (0-1)");
return NULL; return NULL;
} }
} else {
_set_error("Only integer constants are allowed as index at the moment");
return NULL;
} }
switch (expr->get_datatype()) { switch (expr->get_datatype()) {
@ -3327,9 +3324,6 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
_set_error("Index out of range (0-2)"); _set_error("Index out of range (0-2)");
return NULL; return NULL;
} }
} else {
_set_error("Only integer constants are allowed as index at the moment");
return NULL;
} }
switch (expr->get_datatype()) { switch (expr->get_datatype()) {
@ -3352,9 +3346,6 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
_set_error("Index out of range (0-3)"); _set_error("Index out of range (0-3)");
return NULL; return NULL;
} }
} else {
_set_error("Only integer constants are allowed as index at the moment");
return NULL;
} }
switch (expr->get_datatype()) { switch (expr->get_datatype()) {