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

Fix shader constant sorting

Browse Source
This commit is contained in:
Yuri Roubinsky
2020-04-11 12:40:17 +03:00
parent 8806e7d5f3
commit bc30f541e6
4 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
servers/rendering/rasterizer_rd/shader_compiler_rd.cpp
View File

@@ -547,18 +547,19 @@ String ShaderCompilerRD::_dump_node_code(const SL::Node *p_node, int p_level, Ge
index++;
}
for (Map<StringName, SL::ShaderNode::Constant>::Element *E = pnode->constants.front(); E; E = E->next()) {
for (int i = 0; i < pnode->vconstants.size(); i++) {
const SL::ShaderNode::Constant &cnode = pnode->vconstants[i];
String gcode;
gcode += "const ";
gcode += _prestr(E->get().precision);
if (E->get().type == SL::TYPE_STRUCT) {
gcode += _mkid(E->get().type_str);
gcode += _prestr(cnode.precision);
if (cnode.type == SL::TYPE_STRUCT) {
gcode += _mkid(cnode.type_str);
} else {
gcode += _typestr(E->get().type);
gcode += _typestr(cnode.type);
}
gcode += " " + _mkid(E->key());
gcode += " " + _mkid(String(cnode.name));
gcode += "=";
gcode += _dump_node_code(E->get().initializer, p_level, r_gen_code, p_actions, p_default_actions, p_assigning);
gcode += _dump_node_code(cnode.initializer, p_level, r_gen_code, p_actions, p_default_actions, p_assigning);
gcode += ";\n";
r_gen_code.vertex_global += gcode;
r_gen_code.fragment_global += gcode;