Use objc2-* family of crates
#334
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
madsmtm
commented
Apr 20, 2025
Comment on lines
+80
to
+111
| fn surface_bind_to_gl_texture(surface: &IOSurfaceRef, width: i32, height: i32, has_alpha: bool) { | ||
| const BGRA: GLenum = 0x80E1; | ||
| const RGBA: GLenum = 0x1908; | ||
| const RGB: GLenum = 0x1907; | ||
| const TEXTURE_RECTANGLE_ARB: GLenum = 0x84F5; | ||
| const UNSIGNED_INT_8_8_8_8_REV: GLenum = 0x8367; | ||
|
|
||
| unsafe { | ||
| let context = CGLGetCurrentContext(); | ||
| let gl_error = CGLTexImageIOSurface2D( | ||
| context, | ||
| TEXTURE_RECTANGLE_ARB, | ||
| if has_alpha { | ||
| RGBA as GLenum | ||
| } else { | ||
| RGB as GLenum | ||
| }, | ||
| width, | ||
| height, | ||
| BGRA as GLenum, | ||
| UNSIGNED_INT_8_8_8_8_REV, | ||
| surface as *const IOSurfaceRef as cgl::IOSurfaceRef, | ||
| 0, | ||
| ); | ||
|
|
||
| if gl_error != kCGLNoError { | ||
| let error_msg = CStr::from_ptr(CGLErrorString(gl_error)); | ||
| panic!("{}", error_msg.to_string_lossy()); | ||
| } | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
This was previously provided in io_surface::IOSurface::bind_to_gl_texture, but it really mixes two domains (IOSurface and CGL), and requires that we link both of those, so I didn't want to expose it in objc2-io-surface.
Comment on lines
7
to
11
| pub(crate) const kIODefaultCache: i32 = 0; | ||
| pub(crate) const kIOWriteCombineCache: i32 = 4; | ||
| pub(crate) const kIOMapCacheShift: i32 = 8; | ||
| pub(crate) const kIOMapDefaultCache: i32 = kIODefaultCache << kIOMapCacheShift; | ||
| pub(crate) const kIOMapWriteCombineCache: i32 = kIOWriteCombineCache << kIOMapCacheShift; |
There was a problem hiding this comment.
Provided in objc2-io-kit, but felt like too little benefit to take on the dependency.
| let () = msg_send![self.view.0, release]; | ||
| self.surface | ||
| .io_surface | ||
| .unlock(IOSurfaceLockOptions::empty(), &mut seed); | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
This kind of manual memory management is now unnecessary, the Retained<NSView> in NativeWidget will do it for you.
87 tasks
mrobinson
reviewed
Apr 25, 2025
mrobinson
approved these changes
Apr 25, 2025
|
I've marked this as ready now, since servo/core-foundation-rs#729 seems to be settling on deprecating the Unsure why CI failed, maybe spurious? |
github-merge-queue
bot
removed this pull request from the merge queue due to no response for status checks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The
objc2-*family of crates provide many benefits over thecore-foundation-rscrates, most notably here is that the bindings are auto-generated and thus much more complete (meaning that we can avoid the error-pronemsg_send!in almost all cases).See servo/core-foundation-rs#729 for additional motivation.