uikit: type UIKitPlatform fields properly + handle optional in Obj-C encoding

The UIKitPlatform struct had a string of '*void = null; // UIWindow*'
fields — the type lived in a comment, every callsite had to 'xx'-cast
back to the real type. Migrated to the real foreign-class pointer
types now that M3 declared all the relevant '#objc_class' aliases:

  window:       ?*UIWindow
  root_vc:      ?*UIViewController
  gl_view:      ?*UIView         (SxGLView OR SxMetalView — both extend UIView)
  gl_layer:     ?*CALayer        (CAEAGLLayer OR CAMetalLayer)
  gl_ctx:       ?*EAGLContext
  display_link: ?*CADisplayLink

Each field is wrapped in '?' since the platform may not have set
it yet (gl_ctx is null in metal mode, display_link is null before
the first frame, etc.).

SxSceneDelegate's window getter/setter now take/return '?*UIWindow'
instead of '*void' so calling code doesn't need an xx-cast.

Required fix in objcTypeEncodingFromSignature: '?T' (optional) was
bailing with 'type kind not yet supported'. Apple's runtime treats
nullability as 'pointer may be null' — the wire encoding is the
same as T. Recursive unwrap handles ?*UIView → '@', ?*CADisplayLink
→ '@', etc.

Chess on iOS-sim: board renders, full pipeline intact. 183 tests
+ zig build test green.
This commit is contained in:
agra
2026-05-26 07:51:12 +03:00
parent d403f56673
commit f75923af00
2 changed files with 20 additions and 9 deletions

View File

@@ -217,12 +217,12 @@ SxSceneDelegate :: #objc_class("SxSceneDelegate") {
uikit_scene_will_connect(xx self, xx 0, scene, session, options);
}
window :: (self: *Self) -> *void {
if g_uikit_plat == null { return xx 0; }
window :: (self: *Self) -> ?*UIWindow {
if g_uikit_plat == null { return null; }
return g_uikit_plat.window;
}
setWindow :: (self: *Self, w: *void) {
setWindow :: (self: *Self, w: ?*UIWindow) {
if g_uikit_plat == null { return; }
g_uikit_plat.window = w;
}
@@ -247,12 +247,15 @@ GpuMode :: enum {
}
UIKitPlatform :: struct {
window: *void = null; // UIWindow*
root_vc: *void = null; // UIViewController*
gl_view: *void = null; // SxGLView* OR SxMetalView* (depending on gpu_mode)
gl_layer: *void = null; // CAEAGLLayer* OR CAMetalLayer* (= gl_view.layer)
gl_ctx: *void = null; // EAGLContext* (null in metal mode)
display_link: *void = null;
window: ?*UIWindow = null;
root_vc: ?*UIViewController = null;
// SxGLView (gles mode) or SxMetalView (metal mode) — both extend
// UIView, so the common method surface is reachable as *UIView.
gl_view: ?*UIView = null;
// CAEAGLLayer (gles) or CAMetalLayer (metal) — both extend CALayer.
gl_layer: ?*CALayer = null;
gl_ctx: ?*EAGLContext = null;
display_link: ?*CADisplayLink = null;
color_renderbuffer: u32 = 0;
framebuffer: u32 = 0;
gl_initialized: bool = false;

View File

@@ -4713,6 +4713,14 @@ pub const Lowering = struct {
try out.appendSlice(self.alloc, "^v");
}
},
.optional => |o| {
// sx's `?T` is a nullable T. At the Obj-C ABI boundary
// nullability is just "this pointer may be null" — the
// wire-level encoding is the same as T. Unwrap and
// recurse. (Same goes for `?*UIView` etc. — the
// underlying pointer kind drives the encoding char.)
return self.appendObjcEncoding(out, o.child, span);
},
else => return self.bailObjcEncoding(span, "type kind not yet supported by Obj-C encoding", @intFromEnum(std.meta.activeTag(info))),
}
}