diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-01-14 11:44:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-14 11:44:17 +0100 |
| commit | 4e8bf74d564fc404c2ebf8b56611bcae54bcdd90 (patch) | |
| tree | a41c03fa7f75367082b78c57aeed499042bfb5b5 /servers/rendering/shader_compiler.cpp | |
| parent | 9b3535a33a1dda541a3a39e7786b8428fadbff6c (diff) | |
| parent | 0845b25497c00757e94b7c8f035fa1182282a0fd (diff) | |
Merge pull request #56781 from Chaosus/shader_fix_varyings_crash
Diffstat (limited to 'servers/rendering/shader_compiler.cpp')
| -rw-r--r-- | servers/rendering/shader_compiler.cpp | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/servers/rendering/shader_compiler.cpp b/servers/rendering/shader_compiler.cpp index 114e7e66cb..b0629de2f0 100644 --- a/servers/rendering/shader_compiler.cpp +++ b/servers/rendering/shader_compiler.cpp @@ -692,17 +692,36 @@ String ShaderCompiler::_dump_node_code(const SL::Node *p_node, int p_level, Gene vcode += _prestr(varying.precision, ShaderLanguage::is_float_type(varying.type)); vcode += _typestr(varying.type); vcode += " " + _mkid(varying_name); + uint32_t inc = 1U; + if (varying.array_size > 0) { + inc = (uint32_t)varying.array_size; + vcode += "["; vcode += itos(varying.array_size); vcode += "]"; } + + switch (varying.type) { + case SL::TYPE_MAT2: + inc *= 2U; + break; + case SL::TYPE_MAT3: + inc *= 3U; + break; + case SL::TYPE_MAT4: + inc *= 4U; + break; + default: + break; + } + vcode += ";\n"; r_gen_code.stage_globals[STAGE_VERTEX] += "layout(location=" + itos(index) + ") " + interp_mode + "out " + vcode; r_gen_code.stage_globals[STAGE_FRAGMENT] += "layout(location=" + itos(index) + ") " + interp_mode + "in " + vcode; - index++; + index += inc; } if (var_frag_to_light.size() > 0) { |