From 6ca808b5f4a60b1f65b816ff8b9401fd7b2ec1bd Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 12 Nov 2022 19:44:09 +0100 Subject: don't branch in loader::ensure_plugins --- loader/impl.cpp | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'loader/impl.cpp') diff --git a/loader/impl.cpp b/loader/impl.cpp index 6b0ba333..65516e17 100644 --- a/loader/impl.cpp +++ b/loader/impl.cpp @@ -31,18 +31,15 @@ loader_impl::~loader_impl() = default; void loader_impl::ensure_plugins() { - if (!importer_plugins) - importer_plugins.emplace(); - if (!image_importer) - { - image_importer = importer_plugins->loadAndInstantiate("StbImageImporter"); - fm_assert(image_importer); - } - if (!tga_importer) - { - tga_importer = importer_plugins->loadAndInstantiate("TgaImporter"); - fm_assert(tga_importer); - } + if (importer_plugins) + return; + + importer_plugins.emplace(); + image_importer = importer_plugins->loadAndInstantiate("StbImageImporter"); + tga_importer = importer_plugins->loadAndInstantiate("TgaImporter"); + + fm_assert(image_importer); + fm_assert(tga_importer); } } // namespace floormat::loader_detail -- cgit v1.2.3