CoreGraphics tvOS xcode14.0 beta1

#CoreGraphics.framework https://github.com/xamarin/xamarin-macios/pull/15831

diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGAffineTransform.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGAffineTransform.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGAffineTransform.h	2022-02-23 10:56:23.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGAffineTransform.h	2022-05-31 15:02:38.000000000 -0400
@@ -5,18 +5,22 @@
 #ifndef CGAFFINETRANSFORM_H_
 #define CGAFFINETRANSFORM_H_
 
-typedef struct CGAffineTransform CGAffineTransform;
-
 #include <CoreGraphics/CGBase.h>
 #include <CoreGraphics/CGGeometry.h>
+#include <CoreFoundation/CFBase.h>
 
 CF_IMPLICIT_BRIDGING_ENABLED
 
+#ifndef CF_DEFINES_CG_TYPES
+typedef struct CGAffineTransform CGAffineTransform;
+
 struct CGAffineTransform {
   CGFloat a, b, c, d;
   CGFloat tx, ty;
 };
 
+#endif /* CF_DEFINES_CG_TYPES */
+
 /* The identity transform: [ 1 0 0 1 0 0 ]. */
 
 CG_EXTERN const CGAffineTransform CGAffineTransformIdentity
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGBase.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGBase.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGBase.h	2022-02-23 07:09:38.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGBase.h	2022-05-31 15:02:13.000000000 -0400
@@ -308,6 +308,7 @@
 # endif
 #endif
 
+#ifndef CF_DEFINES_CG_TYPES
 /* Definition of `CGFLOAT_TYPE', `CGFLOAT_IS_DOUBLE', `CGFLOAT_MIN', and
    `CGFLOAT_MAX'. */
 
@@ -330,6 +331,8 @@
 typedef CGFLOAT_TYPE CGFloat;
 #define CGFLOAT_DEFINED 1
 
+#endif /* CF_DEFINES_CG_TYPES */
+
 /* Definition of `CG_OBSOLETE'. Deprecated; to be removed. */
 
 #if !defined(CG_OBSOLETE)
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGColor.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGColor.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGColor.h	2022-02-23 07:13:45.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGColor.h	2022-05-31 15:02:15.000000000 -0400
@@ -9,7 +9,7 @@
 #include <CoreFoundation/CFAvailability.h>
 #include <stdint.h>
 
-typedef struct CF_BRIDGED_TYPE(id) CGColor *CGColorRef;
+typedef struct CF_BRIDGED_TYPE(id) CGColor *CGColorRef; /* Swift Sendable */
 
 #include <CoreGraphics/CGBase.h>
 #include <CoreGraphics/CGColorSpace.h>
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGColorSpace.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGColorSpace.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGColorSpace.h	2022-02-23 10:56:25.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGColorSpace.h	2022-06-03 18:09:11.000000000 -0400
@@ -9,7 +9,7 @@
 #include <CoreFoundation/CFAvailability.h>
 #include <stdint.h>
 
-typedef struct CF_BRIDGED_TYPE(id) CGColorSpace *CGColorSpaceRef;
+typedef struct CF_BRIDGED_TYPE(id) CGColorSpace *CGColorSpaceRef; /* Swift Sendable */
 
 #include <CoreGraphics/CGBase.h>
 #include <CoreGraphics/CGDataProvider.h>
@@ -118,6 +118,9 @@
 CG_EXTERN const CFStringRef kCGColorSpaceITUR_709_PQ
 CG_AVAILABLE_STARTING(12.0, 15.1);
 
+CG_EXTERN const CFStringRef kCGColorSpaceITUR_709_HLG
+CG_AVAILABLE_STARTING(12.0, 15.1);
+
 CG_EXTERN const CFStringRef kCGColorSpaceITUR_2020
 CG_AVAILABLE_STARTING(10.11, 9.0);
 
@@ -465,6 +468,9 @@
 CG_EXTERN CGColorSpaceRef  __nullable CGColorSpaceCreateExtendedLinearized(CGColorSpaceRef space)
 CG_AVAILABLE_STARTING(11.0, 14.0);
 
+/* Create a copy of the color space which uses standard range [0.0, 1.0]. */
+CG_EXTERN CGColorSpaceRef CGColorSpaceCreateCopyWithStandardRange(CGColorSpaceRef s)
+CG_AVAILABLE_STARTING(13.0, 16.0);
 
 /* Deprecated functions */
 
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGGeometry.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGGeometry.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGGeometry.h	2022-02-23 07:13:45.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGGeometry.h	2022-05-31 14:51:52.000000000 -0400
@@ -15,6 +15,7 @@
 
 CF_ASSUME_NONNULL_BEGIN
 
+#ifndef CF_DEFINES_CG_TYPES
 /* Points. */
 struct
 CGPoint {
@@ -55,6 +56,8 @@
     CGRectMinXEdge, CGRectMinYEdge, CGRectMaxXEdge, CGRectMaxYEdge
 };
 
+#endif /* CF_DEFINES_CG_TYPES */
+
 /* The "zero" point -- equivalent to CGPointMake(0, 0). */ 
 
 CG_EXTERN const CGPoint CGPointZero
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGImage.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGImage.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGImage.h	2022-02-23 07:15:51.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGImage.h	2022-05-31 15:04:00.000000000 -0400
@@ -9,7 +9,7 @@
 #include <CoreFoundation/CFAvailability.h>
 #include <stdint.h>
 
-typedef struct CF_BRIDGED_TYPE(id) CGImage *CGImageRef;
+typedef struct CF_BRIDGED_TYPE(id) CGImage *CGImageRef;  /* Swift Sendable */
 
 #include <CoreGraphics/CGColorSpace.h>
 #include <CoreGraphics/CGDataProvider.h>
@@ -42,10 +42,12 @@
 typedef CF_ENUM(uint32_t, CGImagePixelFormatInfo) {
     kCGImagePixelFormatMask      = 0xF0000,
     kCGImagePixelFormatPacked    = (0 << 16),
-    kCGImagePixelFormatRGB555    = (1 << 16), /* Only for RGB 16 bits per pixel */
-    kCGImagePixelFormatRGB565    = (2 << 16), /* Only for RGB 16 bits per pixel */
-    kCGImagePixelFormatRGB101010 = (3 << 16), /* Only for RGB 32 bits per pixel */
-    kCGImagePixelFormatRGBCIF10  = (4 << 16), /* Only for RGB 32 bits per pixel */
+    kCGImagePixelFormatRGB555    = (1 << 16), /* Only for RGB 16 bits per pixel, alpha != alpha none */
+    kCGImagePixelFormatRGB565    = (2 << 16), /* Only for RGB 16 bits per pixel, alpha none */
+    kCGImagePixelFormatRGB101010 = (3 << 16), /* Only for RGB 32 bits per pixel, alpha != none */
+    kCGImagePixelFormatRGBCIF10  = (4 << 16)  /* Only for RGB 32 bits per pixel,
+                                               * 10 bits per component, kCGImageByteOrder32Little
+                                               * The 2 MSB of the pixel need to be set to 1 */
 } CG_AVAILABLE_STARTING(10.14, 12.0);
 
 typedef CF_OPTIONS(uint32_t, CGBitmapInfo) {
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGPDFScanner.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGPDFScanner.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGPDFScanner.h	2022-02-23 07:55:53.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGPDFScanner.h	2022-05-31 14:49:23.000000000 -0400
@@ -112,6 +112,10 @@
     CGPDFStreamRef __nullable * __nullable value)
     CG_AVAILABLE_STARTING(10.4, 2.0);
 
+/* Cleanly stop the scanner on the current operator, releasing any
+   temporary resources. */
+CG_EXTERN void CGPDFScannerStop(CGPDFScannerRef s);
+
 CF_ASSUME_NONNULL_END
 
 CF_IMPLICIT_BRIDGING_DISABLED
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGPath.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGPath.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGPath.h	2022-02-23 10:56:25.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGPath.h	2022-05-31 15:02:15.000000000 -0400
@@ -15,6 +15,7 @@
 #include <CoreGraphics/CGBase.h>
 #include <CoreGraphics/CGAffineTransform.h>
 #include <CoreFoundation/CFBase.h>
+#include <CoreFoundation/CFArray.h>
 
 CF_IMPLICIT_BRIDGING_ENABLED
 
@@ -393,6 +394,47 @@
 CG_EXTERN void CGPathApplyWithBlock(CGPathRef path, CGPathApplyBlock CF_NOESCAPE block)
     CG_AVAILABLE_STARTING(10.13, 11.0);
 
+
+/* Returns a new weakly-simple path without self-intersections and with a normalized orientation. Filling the resulting path using even-odd or non-zero filling is identical. */
+
+CG_EXTERN CGPathRef __nullable CGPathCreateCopyByNormalizing(CGPathRef cg_nullable path, bool evenOddFillRule) CG_AVAILABLE_STARTING(13.0, 16.0);
+
+/* Returns a new path created by unioning `path` and `maskPath`. Any unclosed subpaths in either path are assumed to be closed. The resulting path is suitable for either even-odd or non-zero filling. */
+
+CG_EXTERN CGPathRef __nullable CGPathCreateCopyByUnioningPath(CGPathRef cg_nullable path, CGPathRef cg_nullable maskPath, bool evenOddFillRule) CG_AVAILABLE_STARTING(13.0, 16.0);
+
+/* Returns a new path created by intersecting `path` and `maskPath`. Any unclosed subpaths in either path are assumed to be closed. The resulting path is suitable for either even-odd or non-zero filling. */
+
+CG_EXTERN CGPathRef __nullable CGPathCreateCopyByIntersectingPath(CGPathRef cg_nullable path, CGPathRef cg_nullable maskPath, bool evenOddFillRule) CG_AVAILABLE_STARTING(13.0, 16.0);
+
+/* Returns a new path created by subtracting `maskPath` from `path`. Any unclosed subpaths in either path are assumed to be closed. The resulting path is suitable for either even-odd or non-zero filling. */
+
+CG_EXTERN CGPathRef __nullable CGPathCreateCopyBySubtractingPath(CGPathRef cg_nullable path, CGPathRef cg_nullable maskPath, bool evenOddFillRule) CG_AVAILABLE_STARTING(13.0, 16.0);
+
+/* Returns a new path created by exclusive or-ing `path` and `maskPath`. Any unclosed subpaths in either path are assumed to be closed. The resulting path is suitable for either even-odd or non-zero filling. */
+
+CG_EXTERN CGPathRef __nullable CGPathCreateCopyBySymmetricDifferenceOfPath(CGPathRef cg_nullable path, CGPathRef cg_nullable maskPath, bool evenOddFillRule) CG_AVAILABLE_STARTING(13.0, 16.0);
+
+/* Returns a new path created by subtracting the `maskPath` from the line of `path` with the fill of `maskPath`. This returns a potentially open path. */
+
+CG_EXTERN CGPathRef __nullable CGPathCreateCopyOfLineBySubtractingPath(CGPathRef cg_nullable path, CGPathRef cg_nullable maskPath, bool evenOddFillRule) CG_AVAILABLE_STARTING(13.0, 16.0);
+
+/* Returns a new path created by intersecting the line of `path` and the fill of `maskPath`. This returns a potentially open path. */
+
+CG_EXTERN CGPathRef __nullable CGPathCreateCopyOfLineByIntersectingPath(CGPathRef cg_nullable path, CGPathRef cg_nullable maskPath, bool evenOddFillRule) CG_AVAILABLE_STARTING(13.0, 16.0);
+
+/* Return an array of the visually separated components of a path. */
+
+CG_EXTERN CFArrayRef __nullable CGPathCreateSeparateComponents(CGPathRef cg_nullable path, bool evenOddFillRule) CG_AVAILABLE_STARTING(13.0, 16.0);
+
+/* Returns a new path that is flattened, converting all curved line segments into straight line approximations. The granularity of the approximations is controlled by `flatteningThreshold`  the maximum error tolerance (measured in points) for curves. */
+
+CG_EXTERN CGPathRef __nullable CGPathCreateCopyByFlattening(CGPathRef cg_nullable path, CGFloat flatteningThreshold) CG_AVAILABLE_STARTING(13.0, 16.0);
+
+/* Returns true if path1 and path2 overlap. */
+/* The trailing `UsingEvenOdd' will be removed soon. It's here temporarily for backward compatibility with an existing caller of `CGPathIntersectsPath' rdar://89310639. */
+CG_EXTERN bool CGPathIntersectsPathUsingEvenOdd(CGPathRef cg_nullable path1, CGPathRef cg_nullable path2, bool evenOddFillRule) CG_AVAILABLE_STARTING(13.0, 16.0);
+
 CF_ASSUME_NONNULL_END
 
 CF_IMPLICIT_BRIDGING_DISABLED
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CoreGraphics.apinotes /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CoreGraphics.apinotes
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CoreGraphics.apinotes	2022-02-12 06:58:57.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CoreGraphics.apinotes	2022-05-21 05:05:18.000000000 -0400
@@ -5,64 +5,6 @@
 # Global functions
 #
 Functions:
-# The below are inline functions that are irrelevant due to memberwise inits
-- Name: CGPointMake
-  Availability: nonswift
-  SwiftName: CGPoint.init(x:y:)
-- Name: CGSizeMake
-  Availability: nonswift
-  SwiftName: CGSize.init(width:height:)
-- Name: CGVectorMake
-  Availability: nonswift
-  SwiftName: CGVector.init(dx:dy:)
-- Name: CGRectMake
-  Availability: nonswift
-  SwiftName: CGRect.init(x:y:width:height:)
-- Name: CGAffineTransformMake
-  Availability: nonswift
-  SwiftName: CGAffineTransform.init(a:b:c:d:tx:ty:)
-# The below are fixups that inference didnt quite do what we wanted, and are
-# pulled over from what used to be in the overlays
-- Name: CGRectIsNull
-  SwiftName: "getter:CGRect.isNull(self:)"
-- Name: CGRectIsEmpty
-  SwiftName: "getter:CGRect.isEmpty(self:)"
-- Name: CGRectIsInfinite
-  SwiftName: "getter:CGRect.isInfinite(self:)"
-- Name: CGRectStandardize
-  SwiftName: "getter:CGRect.standardized(self:)"
-- Name: CGRectIntegral
-  SwiftName: "getter:CGRect.integral(self:)"
-- Name: CGRectInset
-  SwiftName: "CGRect.insetBy(self:dx:dy:)"
-- Name: CGRectOffset
-  SwiftName: "CGRect.offsetBy(self:dx:dy:)"
-- Name: CGRectUnion
-  SwiftName: "CGRect.union(self:_:)"
-- Name: CGRectIntersection
-  SwiftName: "CGRect.intersection(self:_:)"
-- Name: CGRectContainsRect
-  SwiftName: "CGRect.contains(self:_:)"
-- Name: CGRectContainsPoint
-  SwiftName: "CGRect.contains(self:_:)"
-- Name: CGRectIntersectsRect
-  SwiftName: "CGRect.intersects(self:_:)"
-- Name: CGRectGetMinX
-  SwiftName: getter:CGRect.minX(self:)
-- Name: CGRectGetMidX
-  SwiftName: getter:CGRect.midX(self:)
-- Name: CGRectGetMaxX
-  SwiftName: getter:CGRect.maxX(self:)
-- Name: CGRectGetMinY
-  SwiftName: getter:CGRect.minY(self:)
-- Name: CGRectGetMidY
-  SwiftName: getter:CGRect.midY(self:)
-- Name: CGRectGetMaxY
-  SwiftName: getter:CGRect.maxY(self:)
-- Name: CGRectGetWidth
-  SwiftName: getter:CGRect.width(self:)
-- Name: CGRectGetHeight
-  SwiftName: getter:CGRect.height(self:)
 # The below are not available in Swift
 # FIXME: empty-argument-label pattern is currently failing SILGen
 - Name: CGColorSpaceCreateDeviceGray
@@ -82,38 +24,6 @@
   Availability: nonswift
   SwiftName: CGColorConversionInfo.init(fromListWithArgumentsOptions:_:_:_:_:)
 
-# The below are attempts at providing better names than inference
-# CGAffineTransform
-- Name: CGAffineTransformMakeTranslation
-  SwiftName: CGAffineTransform.init(translationX:y:)
-- Name: CGAffineTransformMakeScale
-  SwiftName: CGAffineTransform.init(scaleX:y:)
-- Name: CGAffineTransformMakeRotation
-  SwiftName: CGAffineTransform.init(rotationAngle:)
-- Name: CGAffineTransformIsIdentity
-  SwiftName: getter:CGAffineTransform.isIdentity(self:)
-- Name: CGAffineTransformTranslate
-  SwiftName: CGAffineTransform.translatedBy(self:x:y:)
-- Name: CGAffineTransformScale
-  SwiftName: CGAffineTransform.scaledBy(self:x:y:)
-- Name: CGAffineTransformRotate
-  SwiftName: CGAffineTransform.rotated(self:by:)
-- Name: CGAffineTransformConcat
-  SwiftName: CGAffineTransform.concatenating(self:_:)
-- Name: CGAffineTransformInvert
-  SwiftName: CGAffineTransform.inverted(self:)
-- Name: CGPointApplyAffineTransform
-  SwiftName: CGPoint.applying(self:_:)
-- Name: CGSizeApplyAffineTransform
-  SwiftName: CGSize.applying(self:_:)
-- Name: CGRectApplyAffineTransform
-  SwiftName: CGRect.applying(self:_:)
-# These are hidden so we can improve them further in the SDK overlay
-- Name: CGAffineTransformEqualToTransform
-  # replaced by Equatable / ==
-  SwiftName: CGAffineTransform.__equalTo(self:_:)
-  SwiftPrivate: true
-
 # CGBitmapContext
 - Name: CGBitmapContextCreateWithData
   SwiftName: CGContext.init(data:width:height:bitsPerComponent:bytesPerRow:space:bitmapInfo:releaseCallback:releaseInfo:)
@@ -538,37 +448,6 @@
 - Name: CGFontCreateCopyWithVariations
   SwiftName: CGFont.copy(self:withVariations:)
 
-# CGGeometry
-- Name: CGPointCreateDictionaryRepresentation
-  SwiftName: getter:CGPoint.dictionaryRepresentation(self:)
-- Name: CGSizeCreateDictionaryRepresentation
-  SwiftName: getter:CGSize.dictionaryRepresentation(self:)
-- Name: CGRectCreateDictionaryRepresentation
-  SwiftName: getter:CGRect.dictionaryRepresentation(self:)
-- Name: CGPointEqualToPoint
-  SwiftName: CGPoint.equalTo(self:_:)
-- Name: CGSizeEqualToSize
-  SwiftName: CGSize.equalTo(self:_:)
-- Name: CGRectEqualToRect
-  SwiftName: CGRect.equalTo(self:_:)
-# These are hidden so we can improve them further in the SDK overlay
-- Name: CGRectDivide
-  # hide the pointer version in favor of the tuple-return version
-  SwiftName: CGRect.__divided(self:slice:remainder:atDistance:from:)
-  SwiftPrivate: true
-- Name: CGPointMakeWithDictionaryRepresentation
-  # hide in favor of an init (cant map to initializer because out-pointer)
-  SwiftName: CGPoint.__setFromDictionaryRepresentation(_:_:)
-  SwiftPrivate: true
-- Name: CGSizeMakeWithDictionaryRepresentation
-  # hide in favor of an init (cant map to initializer because out-pointer)
-  SwiftName: CGSize.__setFromDictionaryRepresentation(_:_:)
-  SwiftPrivate: true
-- Name: CGRectMakeWithDictionaryRepresentation
-  # hide in favor of an init (cant map to initializer because out-pointer)
-  SwiftName: CGRect.__setFromDictionaryRepresentation(_:_:)
-  SwiftPrivate: true
-
 # CGGradient
 - Name: CGGradientCreateWithColorComponents
   SwiftName: CGGradient.init(colorSpace:colorComponents:locations:count:)
@@ -725,6 +604,36 @@
   # replaced in favor of == / Equatable
   SwiftName: CGPath.__equalTo(self:_:)
   SwiftPrivate: true
+- Name: CGPathCreateCopyByNormalizing
+  SwiftName: CGPath.__normalized(self:eoFill:)
+  SwiftPrivate: true
+- Name: CGPathCreateCopyByUnioningPath
+  SwiftName: CGPath.__union(self:other:eoFill:)
+  SwiftPrivate: true
+- Name: CGPathCreateCopyByIntersectingPath
+  SwiftName: CGPath.__intersection(self:other:eoFill:)
+  SwiftPrivate: true
+- Name: CGPathCreateCopyBySubtractingPath
+  SwiftName: CGPath.__subtracting(self:other:eoFill:)
+  SwiftPrivate: true
+- Name: CGPathCreateCopyBySymmetricDifferenceOfPath
+  SwiftName: CGPath.__symmetricDifference(self:other:eoFill:)
+  SwiftPrivate: true
+- Name: CGPathCreateCopyOfLineBySubtractingPath
+  SwiftName: CGPath.__lineSubtracting(self:other:eoFill:)
+  SwiftPrivate: true
+- Name: CGPathCreateCopyOfLineByIntersectingPath
+  SwiftName: CGPath.__lineIntersection(self:other:eoFill:)
+  SwiftPrivate: true
+- Name: CGPathCreateSeparateComponents
+  SwiftName: CGPath.__componentsSeparated(self:eoFill:)
+  SwiftPrivate: true
+- Name: CGPathCreateCopyByFlattening
+  SwiftName: CGPath.__flattened(self:threshold:)
+  SwiftPrivate: true
+- Name: CGPathIntersectsPathUsingEvenOdd
+  SwiftName: CGPath.__intersects(self:other:eoFill:)
+  SwiftPrivate: true
 - Name: CGPathAddRoundedRect
   SwiftName: CGMutablePath.__addRoundedRect(self:transform:rect:cornerWidth:cornerHeight:)
 - Name: CGPathMoveToPoint
@@ -1168,26 +1077,6 @@
 # Global variables
 #
 Globals:
-# The below are globals that are defined as opaque C constants for no good
-# reason.
-- Name: CGPointZero
-  Availability: nonswift
-  SwiftName: CGPoint.zero
-- Name: CGSizeZero
-  Availability: nonswift
-  SwiftName: CGSize.zero
-- Name: CGVectorZero
-  Availability: nonswift
-- Name: CGRectZero
-  Availability: nonswift
-  SwiftName: CGRect.zero
-- Name: CGAffineTransformIdentity
-  Availability: nonswift
-  SwiftName: CGAffineTransform.identity
-- Name: CGRectNull
-  SwiftName: CGRect.null
-- Name: CGRectInfinite
-  SwiftName: CGRect.infinite
 # The below are not available in Swift
 - Name: kCGColorSpaceGenericGray
   Availability: nonswift
@@ -1227,6 +1116,8 @@
   SwiftName: CGColorSpace.itur_709
 - Name: kCGColorSpaceITUR_709_PQ
   SwiftName: CGColorSpace.itur_709_PQ
+- Name: kCGColorSpaceITUR_709_HLG
+  SwiftName: CGColorSpace.itur_709_HLG
 - Name: kCGColorSpaceITUR_2020
   SwiftName: CGColorSpace.itur_2020
 - Name: kCGColorSpaceITUR_2020_sRGBGamma