From 3e41400a63a18aed0b480984d38b4712eb3381b3 Mon Sep 17 00:00:00 2001
From: SirLynix <lynix680@gmail.com>
Date: Sun, 26 Feb 2023 13:43:55 +0100
Subject: [PATCH] Renderer/Renderer: Cleanup a bit

---
 src/Nazara/Renderer/Renderer.cpp | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/Nazara/Renderer/Renderer.cpp b/src/Nazara/Renderer/Renderer.cpp
index 7ffd78185..d2cdeeeab 100644
--- a/src/Nazara/Renderer/Renderer.cpp
+++ b/src/Nazara/Renderer/Renderer.cpp
@@ -82,17 +82,6 @@ namespace Nz
 
 	void Renderer::LoadBackend(const Config& config)
 	{
-		constexpr std::array<const char*, RenderAPICount> rendererPaths = {
-			NazaraRendererPrefix "NazaraDirect3DRenderer" NazaraRendererDebugSuffix, // Direct3D
-			NazaraRendererPrefix "NazaraMantleRenderer"   NazaraRendererDebugSuffix, // Mantle
-			NazaraRendererPrefix "NazaraMetalRenderer"    NazaraRendererDebugSuffix, // Metal
-			NazaraRendererPrefix "NazaraOpenGLRenderer"   NazaraRendererDebugSuffix, // OpenGL
-			NazaraRendererPrefix "NazaraOpenGLRenderer"   NazaraRendererDebugSuffix, // OpenGL_ES
-			NazaraRendererPrefix "NazaraVulkanRenderer"   NazaraRendererDebugSuffix, // Vulkan
-
-			nullptr // Unknown
-		};
-
 		struct RendererImplementations
 		{
 #ifdef NAZARA_RENDERER_EMBEDDEDBACKENDS
@@ -112,12 +101,6 @@ namespace Nz
 #ifdef NAZARA_RENDERER_EMBEDDEDBACKENDS
 		auto RegisterImpl = [&](RenderAPI api, auto ComputeScore, std::function<std::unique_ptr<RendererImpl>()> factory)
 		{
-			const char* rendererName = rendererPaths[UnderlyingCast(api)];
-			assert(rendererName);
-
-			std::filesystem::path fileName(rendererName);
-			fileName.replace_extension(NAZARA_DYNLIB_EXTENSION);
-
 			int score = ComputeScore();
 			if (score >= 0)
 			{
@@ -133,6 +116,17 @@ namespace Nz
 #endif
 
 #else
+		constexpr std::array<const char*, RenderAPICount> rendererPaths = {
+			NazaraRendererPrefix "NazaraDirect3DRenderer" NazaraRendererDebugSuffix, // Direct3D
+			NazaraRendererPrefix "NazaraMantleRenderer"   NazaraRendererDebugSuffix, // Mantle
+			NazaraRendererPrefix "NazaraMetalRenderer"    NazaraRendererDebugSuffix, // Metal
+			NazaraRendererPrefix "NazaraOpenGLRenderer"   NazaraRendererDebugSuffix, // OpenGL
+			NazaraRendererPrefix "NazaraOpenGLRenderer"   NazaraRendererDebugSuffix, // OpenGL_ES
+			NazaraRendererPrefix "NazaraVulkanRenderer"   NazaraRendererDebugSuffix, // Vulkan
+
+			nullptr // Unknown
+		};
+
 		auto RegisterImpl = [&](RenderAPI api, auto ComputeScore)
 		{
 			const char* rendererName = rendererPaths[UnderlyingCast(api)];