Merge pull request #11247 from tellowkrinkle/MetalHeadless

VideoBackends:Metal: Headless render support
dolphin-emu · Nov 4, 2022 · c2e6d85 · c2e6d85
2 parents 7a76aee + 83ca1ad
commit c2e6d85
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/Source/Core/VideoBackends/Metal/MTLMain.mm b/Source/Core/VideoBackends/Metal/MTLMain.mm
@@ -54,6 +54,7 @@ static bool WindowSystemTypeSupportsMetal(WindowSystemType type)
   switch (type)
   {
   case WindowSystemType::MacOS:
+  case WindowSystemType::Headless:
     return true;
   default:
     return false;
@@ -64,7 +65,8 @@ static bool WindowSystemTypeSupportsMetal(WindowSystemType type)
 {
   @autoreleasepool
   {
-    if (!WindowSystemTypeSupportsMetal(wsi.type) || !wsi.render_surface)
+    const bool surface_ok = wsi.type == WindowSystemType::Headless || wsi.render_surface;
+    if (!WindowSystemTypeSupportsMetal(wsi.type) || !surface_ok)
     {
       PanicAlertFmt("Bad WindowSystemInfo for Metal renderer.");
       return false;
@@ -100,6 +102,8 @@ static bool WindowSystemTypeSupportsMetal(WindowSystemType type)
       [layer setPixelFormat:MTLPixelFormatBGRA8Unorm];
     CGSize size = [layer bounds].size;
     float scale = [layer contentsScale];
+    if (!layer)  // headless
+      scale = 1.0;
 
     ObjectCache::Initialize(std::move(adapter));
     g_state_tracker = std::make_unique<StateTracker>();