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

Merge pull request #38251 from clayjohn/GLES2-shader-defines 

Avoid duplicating shader defines in GLES2
This commit is contained in:
Rémi Verschelde 2020-04-27 08:47:46 +02:00 committed by GitHub
parent be5a47e75d 782fd5fab6
commit 0233b7e51f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/gles2/shader_compiler_gles2.cpp
View File

@ -488,12 +488,15 @@ String ShaderCompilerGLES2::_dump_node_code(SL::Node *p_node, int p_level, Gener
if (p_default_actions.usage_defines.has(var_node->name) && !used_name_defines.has(var_node->name)) { if (p_default_actions.usage_defines.has(var_node->name) && !used_name_defines.has(var_node->name)) {
String define = p_default_actions.usage_defines[var_node->name]; String define = p_default_actions.usage_defines[var_node->name];
String node_name = define.substr(1, define.length());
if (define.begins_with("@")) { if (define.begins_with("@")) {
define = p_default_actions.usage_defines[define.substr(1, define.length())]; define = p_default_actions.usage_defines[node_name];
} }
r_gen_code.custom_defines.push_back(define.utf8()); if (!used_name_defines.has(node_name)) {
r_gen_code.custom_defines.push_back(define.utf8());
}
used_name_defines.insert(var_node->name); used_name_defines.insert(var_node->name);
} }
@ -550,12 +553,15 @@ String ShaderCompilerGLES2::_dump_node_code(SL::Node *p_node, int p_level, Gener
if (p_default_actions.usage_defines.has(arr_node->name) && !used_name_defines.has(arr_node->name)) { if (p_default_actions.usage_defines.has(arr_node->name) && !used_name_defines.has(arr_node->name)) {
String define = p_default_actions.usage_defines[arr_node->name]; String define = p_default_actions.usage_defines[arr_node->name];
String node_name = define.substr(1, define.length());
if (define.begins_with("@")) { if (define.begins_with("@")) {
define = p_default_actions.usage_defines[define.substr(1, define.length())]; define = p_default_actions.usage_defines[node_name];
} }
r_gen_code.custom_defines.push_back(define.utf8()); if (!used_name_defines.has(node_name)) {
r_gen_code.custom_defines.push_back(define.utf8());
}
used_name_defines.insert(arr_node->name); used_name_defines.insert(arr_node->name);
} }
@ -726,12 +732,15 @@ String ShaderCompilerGLES2::_dump_node_code(SL::Node *p_node, int p_level, Gener
if (p_default_actions.usage_defines.has(var_node->name) && !used_name_defines.has(var_node->name)) { if (p_default_actions.usage_defines.has(var_node->name) && !used_name_defines.has(var_node->name)) {
String define = p_default_actions.usage_defines[var_node->name]; String define = p_default_actions.usage_defines[var_node->name];
String node_name = define.substr(1, define.length());
if (define.begins_with("@")) { if (define.begins_with("@")) {
define = p_default_actions.usage_defines[define.substr(1, define.length())]; define = p_default_actions.usage_defines[node_name];
} }
r_gen_code.custom_defines.push_back(define.utf8()); if (!used_name_defines.has(node_name)) {
r_gen_code.custom_defines.push_back(define.utf8());
}
used_name_defines.insert(var_node->name); used_name_defines.insert(var_node->name);
} }