Fix opengl api not getting used correctly (Kenix3#134)

* fix opengl api not getting used correctly * fix broken if
aMannus · Mar 1, 2023 · 80e558c · 80e558c
1 parent 8b6ea36
commit 80e558c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/core/Window.cpp b/src/core/Window.cpp
@@ -323,15 +323,14 @@ void Window::InitializeWindowManager(std::string_view gfxBackend, std::string_vi
 #endif
 #if defined(ENABLE_OPENGL) || defined(__APPLE__)
     if (gfxBackend == "sdl") {
-        if (gfxApi == "OpenGL") {
-            mRenderingApi = &gfx_opengl_api;
-        }
+        mRenderingApi = &gfx_opengl_api;
+        mWindowManagerApi = &gfx_sdl;
 #ifdef __APPLE__
-        else if (gfxApi == "Metal") {
+        if (gfxApi == "Metal" && Metal_IsSupported()) {
             mRenderingApi = &gfx_metal_api;
         }
 #endif
-        mWindowManagerApi = &gfx_sdl;
+        return;
     }
 #if defined(__linux__) && defined(X11_SUPPORTED)
     if (gfxBackend == "glx") {

diff --git a/src/menu/ImGuiImpl.cpp b/src/menu/ImGuiImpl.cpp
@@ -112,7 +112,7 @@ const char* filters[3] = {
 
 std::vector<std::pair<const char*, const char*>> renderingBackends = {
 #ifdef _WIN32
-    { "Dx11", "DirectX" },
+    { "dx11", "DirectX" },
 #endif
 #ifndef __WIIU__
     { "sdl", "OpenGL" }