remove clipMask

Author: swhitty

Examples/Sources/GalleryView.swift

@@ -36,6 +36,7 @@ struct GalleryView: View {
 
     var images: [SVG] = {
         [
+            "thats-no-moon.svg",
             "avocado.svg",
             "angry.svg",
             "ogre.svg",

SwiftDraw/Sources/Renderer/Renderer.CoreGraphics.swift

@@ -47,7 +47,6 @@ struct CGTypes: RendererTypes, Sendable {
     typealias Rect = CGRect
     typealias Color = CGColor
     typealias Gradient = CGGradient
-    typealias Mask = CGImage
     typealias Path = CGPath
     typealias Pattern = CGTransformingPattern
     typealias Transform = CGAffineTransform
@@ -148,14 +147,6 @@ struct CGProvider: RendererTypeProvider {
                        components: [w, a])!
     }
 
-    func createMask(from contents: [RendererCommand<CGTypes>], size: LayerTree.Size) -> CGImage {
-
-        return CGImage.makeMask(size: createSize(from: size)) { ctx in
-            let renderer = CGRenderer(context: ctx)
-            renderer.perform(contents)
-        }
-    }
-
     func createBlendMode(from mode: LayerTree.BlendMode) -> CGBlendMode {
         switch mode {
         case .normal: return .normal
@@ -389,10 +380,6 @@ struct CGRenderer: Renderer {
         ctx.clip(using: rule)
     }
 
-    func setClip(mask: CGImage, frame: CGRect) {
-        ctx.clip(to: frame, mask: mask)
-    }
-
     func setAlpha(_ alpha: CGFloat) {
         ctx.setAlpha(alpha)
     }

SwiftDraw/Sources/Renderer/Renderer.swift

@@ -37,7 +37,6 @@ protocol RendererTypes {
     associatedtype Rect: Equatable
     associatedtype Color: Equatable
     associatedtype Gradient: Equatable
-    associatedtype Mask: Equatable
     associatedtype Path: Equatable
     associatedtype Pattern: Equatable
     associatedtype Transform: Equatable
@@ -93,7 +92,6 @@ protocol Renderer {
     func setLine(join: Types.LineJoin)
     func setLine(miterLimit: Types.Float)
     func setClip(path: Types.Path, rule: Types.FillRule)
-    func setClip(mask: Types.Mask, frame: Types.Rect)
     func setAlpha(_ alpha: Types.Float)
     func setBlend(mode: Types.BlendMode)
 
@@ -140,8 +138,6 @@ extension Renderer {
             setLine(miterLimit: l)
         case .setClip(path: let p, rule: let r):
             setClip(path: p, rule: r)
-        case .setClipMask(let m, frame: let f):
-            setClip(mask: m, frame: f)
         case .setAlpha(let a):
             setAlpha(a)
         case .setBlend(mode: let m):
@@ -185,7 +181,6 @@ enum RendererCommand<Types: RendererTypes>: @unchecked Sendable {
     case setLineJoin(Types.LineJoin)
     case setLineMiter(limit: Types.Float)
     case setClip(path: Types.Path, rule: Types.FillRule)
-    case setClipMask(Types.Mask, frame: Types.Rect)
     case setAlpha(Types.Float)
     case setBlend(mode: Types.BlendMode)
 

SwiftDraw/Tests/Renderer/RendererTests.swift

@@ -54,7 +54,6 @@ final class RendererTests: XCTestCase {
       .setLineJoin(.bevel),
       .setLineMiter(limit: 10),
       .setClip(path: .mock, rule: .nonzero),
-      .setClipMask([], frame: .zero),
       .fill(.mock, rule: .nonzero),
       .stroke(.mock),
       .clipStrokeOutline(.mock),
@@ -82,7 +81,6 @@ final class RendererTests: XCTestCase {
       "setLineJoin",
       "setLineMiterLimit",
       "setClip",
-      "setClipMask",
       "fillPath",
       "strokePath",
       "clipStrokeOutline",