diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-09-30 23:52:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-30 23:52:46 +0200 |
| commit | 77721b35ba21f2e7e8bb42cf415fccb018517843 (patch) | |
| tree | 96b8f7532ae5d923b75bfbac8d6763015b6646bb /servers/rendering/rendering_device_binds.cpp | |
| parent | 3e1b6304613855cad56938e8a58848f09363a298 (diff) | |
| parent | c63b18507d21b8a213c073bced9057b571cdcd7a (diff) | |
Merge pull request #51409 from LightningAA/use-map-iterators
Use range iterators for `Map` in most cases
Diffstat (limited to 'servers/rendering/rendering_device_binds.cpp')
| -rw-r--r-- | servers/rendering/rendering_device_binds.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/servers/rendering/rendering_device_binds.cpp b/servers/rendering/rendering_device_binds.cpp index fa3f2f3895..a21f28989b 100644 --- a/servers/rendering/rendering_device_binds.cpp +++ b/servers/rendering/rendering_device_binds.cpp @@ -171,7 +171,7 @@ Error RDShaderFile::parse_versions_from_text(const String &p_text, const String /* STEP 2, Compile the versions, add to shader file */ - for (Map<StringName, String>::Element *E = version_texts.front(); E; E = E->next()) { + for (const KeyValue<StringName, String> &E : version_texts) { Ref<RDShaderSPIRV> bytecode; bytecode.instantiate(); @@ -180,7 +180,7 @@ Error RDShaderFile::parse_versions_from_text(const String &p_text, const String if (code == String()) { continue; } - code = code.replace("VERSION_DEFINES", E->get()); + code = code.replace("VERSION_DEFINES", E.value); String error; Vector<uint8_t> spirv = RenderingDevice::get_singleton()->shader_compile_spirv_from_source(RD::ShaderStage(i), code, RD::SHADER_LANGUAGE_GLSL, &error, false); bytecode->set_stage_bytecode(RD::ShaderStage(i), spirv); @@ -195,7 +195,7 @@ Error RDShaderFile::parse_versions_from_text(const String &p_text, const String bytecode->set_stage_compile_error(RD::ShaderStage(i), error); } - set_bytecode(bytecode, E->key()); + set_bytecode(bytecode, E.key); } return errors_found ? ERR_PARSE_ERROR : OK; |