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 #37795 from Chaosus/shader_fix_const_order2

Browse Source 
Fix shader constant sorting
This commit is contained in:
Rémi Verschelde
2020-04-29 09:41:34 +02:00
committed by GitHub
parent 41af228b76 bc30f541e6
commit 0bf6a86db4
4 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
servers/rendering/shader_language.cpp
View File

@@ -6334,6 +6334,7 @@ Error ShaderLanguage::_parse_shader(const Map<StringName, FunctionInfo> &p_funct
while (true) {
ShaderNode::Constant constant;
constant.name = name;
constant.type = is_struct ? TYPE_STRUCT : type;
constant.type_str = struct_name;
constant.precision = precision;
@@ -6373,6 +6374,8 @@ Error ShaderLanguage::_parse_shader(const Map<StringName, FunctionInfo> &p_funct
}
shader->constants[name] = constant;
shader->vconstants.push_back(constant);
if (tk.type == TK_COMMA) {
tk = _get_token();
if (tk.type != TK_IDENTIFIER) {