macOS: Handle unavailable Metal device

juce-framework · Nov 30, 2022 · 6f62954 · 6f62954
1 parent bbd6ccb
commit 6f62954
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/modules/juce_gui_basics/native/juce_ios_UIViewComponentPeer.mm b/modules/juce_gui_basics/native/juce_ios_UIViewComponentPeer.mm
@@ -1398,7 +1398,10 @@ - (UITextRange*) rangeEnclosingPosition: (JuceUITextPosition*) position
 
    #if JUCE_COREGRAPHICS_RENDER_WITH_MULTIPLE_PAINT_CALLS
     if (@available (iOS 13, *))
-        metalRenderer = std::make_unique<CoreGraphicsMetalLayerRenderer<UIView>> (view, comp.isOpaque());
+    {
+        metalRenderer = CoreGraphicsMetalLayerRenderer<UIView>::create (view, comp.isOpaque());
+        jassert (metalRenderer != nullptr);
+    }
    #endif
 
     if ((windowStyleFlags & ComponentPeer::windowRequiresSynchronousCoreGraphicsRendering) == 0)

diff --git a/modules/juce_gui_basics/native/juce_mac_CGMetalLayerRenderer.h b/modules/juce_gui_basics/native/juce_mac_CGMetalLayerRenderer.h
@@ -35,12 +35,11 @@ class CoreGraphicsMetalLayerRenderer
 {
 public:
     //==============================================================================
-    CoreGraphicsMetalLayerRenderer (ViewType* view, bool isOpaque)
+    static auto create (ViewType* view, bool isOpaque)
     {
-        device.reset (MTLCreateSystemDefaultDevice());
-        commandQueue.reset ([device.get() newCommandQueue]);
-
-        attach (view, isOpaque);
+        ObjCObjectHandle<id<MTLDevice>> device { MTLCreateSystemDefaultDevice() };
+        return rawToUniquePtr (device != nullptr ? new CoreGraphicsMetalLayerRenderer (device, view, isOpaque)
+                                                 : nullptr);
     }
 
     ~CoreGraphicsMetalLayerRenderer()
@@ -223,6 +222,16 @@ class CoreGraphicsMetalLayerRenderer
     }
 
 private:
+    //==============================================================================
+    CoreGraphicsMetalLayerRenderer (ObjCObjectHandle<id<MTLDevice>> mtlDevice,
+                                    ViewType* view,
+                                    bool isOpaque)
+        : device (mtlDevice),
+          commandQueue ([device.get() newCommandQueue])
+    {
+        attach (view, isOpaque);
+    }
+
     //==============================================================================
     static auto alignTo (size_t n, size_t alignment)
     {

diff --git a/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm b/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm
@@ -151,7 +151,7 @@ static constexpr int translateVirtualToAsciiKeyCode (int keyCode) noexcept
       #if USE_COREGRAPHICS_RENDERING
        #if JUCE_COREGRAPHICS_RENDER_WITH_MULTIPLE_PAINT_CALLS
         if (@available (macOS 10.14, *))
-            metalRenderer = std::make_unique<CoreGraphicsMetalLayerRenderer<NSView>> (view, getComponent().isOpaque());
+            metalRenderer = CoreGraphicsMetalLayerRenderer<NSView>::create (view, getComponent().isOpaque());
        #endif
         if ((windowStyleFlags & ComponentPeer::windowRequiresSynchronousCoreGraphicsRendering) == 0)
         {