Add the IOSurface framework

crates/header-translator/src/id.rs

@@ -184,11 +184,9 @@ impl Location {
     }
 
     pub fn assert_file(&self, file_name: &str) {
-        assert_eq!(
-            self.file_name(),
-            Some(file_name),
-            "expected {self:?} to be in {file_name:?}"
-        );
+        if self.file_name() != Some(file_name) {
+            error!(?self, ?file_name, "expected to be in file");
+        }
     }
 }
 

crates/header-translator/src/library.rs

@@ -49,7 +49,7 @@ impl Library {
             current = match current.submodules.entry(p.to_string()) {
                 Entry::Occupied(entry) => entry.into_mut(),
                 Entry::Vacant(entry) => {
-                    error!(?location, "expected module to be available in library");
+                    warn!(?location, "expected module to be available in library");
                     entry.insert(Default::default())
                 }
             };

crates/header-translator/src/main.rs

@@ -134,6 +134,9 @@ fn main() -> Result<(), BoxError> {
         let includes = tempdir.join(platform_header);
 
         let mut includes_file = fs::File::create(&includes).unwrap();
+        // Make sure that we pick the IOSurfaceRef that IOSurface defines,
+        // instead of the one that CoreGraphics defines.
+        writeln!(&mut includes_file, "#import <IOSurface/IOSurface.h>")?;
         for lib in config.libraries.values() {
             if !platform_config_filter(lib) {
                 continue;

crates/objc2/src/topics/about_generated/list_data.md

@@ -43,6 +43,7 @@
 | `GameController` | [![`objc2-game-controller`](https://badgen.net/crates/v/objc2-game-controller)](https://crates.io/crates/objc2-game-controller) | [![docs.rs](https://docs.rs/objc2-game-controller/badge.svg)](https://docs.rs/objc2-game-controller/) |
 | `GameKit` | [![`objc2-game-kit`](https://badgen.net/crates/v/objc2-game-kit)](https://crates.io/crates/objc2-game-kit) | [![docs.rs](https://docs.rs/objc2-game-kit/badge.svg)](https://docs.rs/objc2-game-kit/) |
 | `HealthKit` | [![`objc2-health-kit`](https://badgen.net/crates/v/objc2-health-kit)](https://crates.io/crates/objc2-health-kit) | [![docs.rs](https://docs.rs/objc2-health-kit/badge.svg)](https://docs.rs/objc2-health-kit/) |
+| `IOSurface` | [![`objc2-io-surface`](https://badgen.net/crates/v/objc2-io-surface)](https://crates.io/crates/objc2-io-surface) | [![docs.rs](https://docs.rs/objc2-io-surface/badge.svg)](https://docs.rs/objc2-io-surface/) |
 | `IdentityLookup` | [![`objc2-identity-lookup`](https://badgen.net/crates/v/objc2-identity-lookup)](https://crates.io/crates/objc2-identity-lookup) | [![docs.rs](https://docs.rs/objc2-identity-lookup/badge.svg)](https://docs.rs/objc2-identity-lookup/) |
 | `InputMethodKit` | [![`objc2-input-method-kit`](https://badgen.net/crates/v/objc2-input-method-kit)](https://crates.io/crates/objc2-input-method-kit) | [![docs.rs](https://docs.rs/objc2-input-method-kit/badge.svg)](https://docs.rs/objc2-input-method-kit/) |
 | `LinkPresentation` | [![`objc2-link-presentation`](https://badgen.net/crates/v/objc2-link-presentation)](https://crates.io/crates/objc2-link-presentation) | [![docs.rs](https://docs.rs/objc2-link-presentation/badge.svg)](https://docs.rs/objc2-link-presentation/) |

framework-crates/objc2-core-graphics/translation-config.toml

@@ -17,10 +17,7 @@ fn.CGColorSpaceRelease.skipped = true
 
 # CoreGraphics defines this for some reason?
 typedef.IOSurfaceRef.skipped = true
-
-# Needs IOSurfaceRef from IOSurface
-typedef.CGDisplayStreamFrameAvailableHandler.skipped = true
-fn.CGDisplayStreamCreate.skipped = true
+struct.__IOSurface.skipped = true
 
 # Needs io_service_t from the kernel
 fn.CGDisplayIOServicePort.skipped = true

framework-crates/objc2-core-image/translation-config.toml

@@ -29,17 +29,6 @@ class.CIImage.categories.AVDepthData.skipped = true
 class.CIImage.categories.AVPortraitEffectsMatte.skipped = true
 class.CIImage.categories.AVSemanticSegmentationMatte.skipped = true
 
-# Needs `IOSurfaceRef` from IOKit
-class.CIRenderDestination.methods."initWithIOSurface:".skipped = true
-protocol.CIImageProcessorInput.methods.surface.skipped = true
-protocol.CIImageProcessorOutput.methods.surface.skipped = true
-class.CIContext.methods."render:toIOSurface:bounds:colorSpace:".skipped = true
-class.CIImage.methods."imageWithIOSurface:".skipped = true
-class.CIImage.methods."imageWithIOSurface:options:".skipped = true
-class.CIImage.methods."initWithIOSurface:".skipped = true
-class.CIImage.methods."initWithIOSurface:options:".skipped = true
-class.CIImage.methods."initWithIOSurface:plane:format:options:".skipped = true
-
 # Needs `EAGLContext`
 class.CIContext.methods."contextWithEAGLContext:".skipped = true
 class.CIContext.methods."contextWithEAGLContext:options:".skipped = true

framework-crates/objc2-core-video/translation-config.toml

@@ -33,10 +33,6 @@ fn.CVOpenGLESTextureCacheCreateTextureFromImage.skipped = true
 fn.CVOpenGLESTextureGetTarget.skipped = true
 fn.CVOpenGLESTextureGetName.skipped = true
 
-# Needs IOSurfaceRef from IOSurface
-fn.CVPixelBufferGetIOSurface.skipped = true
-fn.CVPixelBufferCreateWithIOSurface.skipped = true
-
 # Unknown how to handle the calling convention here?
 fn.CVMetalTextureGetCleanTexCoords.skipped = true
 fn.CVOpenGLTextureGetCleanTexCoords.skipped = true