Make metal_context hack better

Signed-off-by: Isaac Marovitz <isaacryu@icloud.com>

Author: IsaacMarovitz

CMakeLists.txt

@@ -1342,8 +1342,15 @@ endif()
 target_sources(${PROJECT_NAME} PRIVATE
 		core/wsi/context.h
 		core/wsi/libretro.cpp
-		core/wsi/libretro.h
+		core/wsi/libretro.h)
+
+if(USE_METAL)
+	target_sources(${PROJECT_NAME} PRIVATE
+		core/wsi/switcher.mm)
+else()
+	target_sources(${PROJECT_NAME} PRIVATE
 		core/wsi/switcher.cpp)
+endif()
 
 if(USE_OPENGL)
 	target_compile_definitions(${PROJECT_NAME} PRIVATE USE_OPENGL)

core/rend/metal/metal_context.h

@@ -18,10 +18,8 @@ Copyright 2024 flyinghead
 */
 #pragma once
 
-#ifdef __OBJC__
 #include <Metal/Metal.h>
 #include <QuartzCore/QuartzCore.h>
-#endif
 
 #include "wsi/context.h"
 
@@ -33,19 +31,12 @@ class MetalContext : public GraphicsContext
 
     bool init();
     void term() override;
+    void resize() override;
+    void Present();
 
-#ifdef __OBJC__
     id<MTLDevice> GetDevice() const { return device; }
     CAMetalLayer* GetLayer() const { return layer; }
     id<MTLCommandQueue> GetQueue() const { return queue; }
-// Hack to make sure everything lines up when in pure C++
-#else
-    void* GetDevice() const { return device; }
-    void* GetLayer() const { return layer; }
-    void* GetQueue() const { return queue; }
-#endif
-    void resize() override;
-    void Present();
 
     std::string getDriverName() override;
 
@@ -63,14 +54,9 @@ class MetalContext : public GraphicsContext
 
     static MetalContext* Instance() { return contextInstance; }
 private:
-#ifdef __OBJC__
     id<MTLDevice> device = nil;
     id<MTLCommandQueue> queue = nil;
     CAMetalLayer* layer;
-#else
-    void* device = nullptr;
-    void* queue = nullptr;
-    void* layer = nullptr;
-#endif
+
     static MetalContext* contextInstance;
 };

core/wsi/switcher.mm

@@ -0,0 +1,3 @@
+// When including Metal, switcher needs to be built
+// with Obj-C++ to properly resolve types.
+#include "switcher.cpp"