zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove Objective-C dual namespacing

Browse source
This commit is contained in:
Michael Bradshaw 2024-08-18 19:41:44 -06:00 • committed by Stephen Gutekanst
parent 08f5b84227
commit 8ea49d1c80
3 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/core/Darwin.zig
View file

@ -52,7 +52,7 @@ headless: bool,
refresh_rate: u32, refresh_rate: u32,
size: Size, size: Size,
surface_descriptor: gpu.Surface.Descriptor, surface_descriptor: gpu.Surface.Descriptor,
window: ?*objc.app_kit.ns.Window, window: ?*objc.app_kit.Window,
pub fn run(comptime on_each_update_fn: anytype, args_tuple: std.meta.ArgsTuple(@TypeOf(on_each_update_fn))) noreturn { pub fn run(comptime on_each_update_fn: anytype, args_tuple: std.meta.ArgsTuple(@TypeOf(on_each_update_fn))) noreturn {
const Args = @TypeOf(args_tuple); const Args = @TypeOf(args_tuple);
@ -60,9 +60,9 @@ pub fn run(comptime on_each_update_fn: anytype, args_tuple: std.meta.ArgsTuple(@
const ArgsBytes = @TypeOf(args_bytes.*); const ArgsBytes = @TypeOf(args_bytes.*);
const Helper = struct { const Helper = struct {
// TODO: port libdispatch and use it instead of doing this directly. // TODO: port libdispatch and use it instead of doing this directly.
extern "System" fn dispatch_async(queue: *anyopaque, block: *objc.foundation.ns.Block(fn () void)) void; extern "System" fn dispatch_async(queue: *anyopaque, block: *objc.foundation.Block(fn () void)) void;
extern "System" var _dispatch_main_q: anyopaque; extern "System" var _dispatch_main_q: anyopaque;
pub fn cCallback(block: *objc.foundation.ns.BlockLiteral(ArgsBytes)) callconv(.C) void { pub fn cCallback(block: *objc.foundation.BlockLiteral(ArgsBytes)) callconv(.C) void {
const args: *Args = @ptrCast(&block.context); const args: *Args = @ptrCast(&block.context);
if (@call(.auto, on_each_update_fn, args.*) catch false) { if (@call(.auto, on_each_update_fn, args.*) catch false) {
dispatch_async(&_dispatch_main_q, block.asBlockWithSignature(fn () void)); dispatch_async(&_dispatch_main_q, block.asBlockWithSignature(fn () void));
@ -72,14 +72,14 @@ pub fn run(comptime on_each_update_fn: anytype, args_tuple: std.meta.ArgsTuple(@
} }
} }
}; };
var block_literal = objc.foundation.ns.stackBlockLiteral(Helper.cCallback, args_bytes.*, null, null); var block_literal = objc.foundation.stackBlockLiteral(Helper.cCallback, args_bytes.*, null, null);
// `NSApplicationMain()` and `UIApplicationMain()` never return, so there's no point in trying to add any kind of cleanup work here. // `NSApplicationMain()` and `UIApplicationMain()` never return, so there's no point in trying to add any kind of cleanup work here.
const ns_app = objc.app_kit.ns.Application.sharedApplication(); const ns_app = objc.app_kit.Application.sharedApplication();
const delegate = objc.mach.AppDelegate.allocInit(); const delegate = objc.mach.AppDelegate.allocInit();
delegate.setRunBlock(block_literal.asBlock().copy()); delegate.setRunBlock(block_literal.asBlock().copy());
ns_app.setDelegate(@ptrCast(delegate)); ns_app.setDelegate(@ptrCast(delegate));
_ = objc.app_kit.ns.applicationMain(0, undefined); _ = objc.app_kit.applicationMain(0, undefined);
unreachable; unreachable;
// TODO: support UIKit. // TODO: support UIKit.
@ -90,28 +90,28 @@ pub fn init(darwin: *Darwin, options: InitOptions) !void {
var surface_descriptor = gpu.Surface.Descriptor{}; var surface_descriptor = gpu.Surface.Descriptor{};
// TODO: support UIKit. // TODO: support UIKit.
var window: ?*objc.appkit.ns.Window = null; var window: ?*objc.app_kit.Window = null;
if (!options.headless) { if (!options.headless) {
const metal_descriptor = try options.allocator.create(gpu.Surface.DescriptorFromMetalLayer); const metal_descriptor = try options.allocator.create(gpu.Surface.DescriptorFromMetalLayer);
const layer = objc.quartz_core.ca.MetalLayer.new(); const layer = objc.quartz_core.MetalLayer.new();
defer layer.release(); defer layer.release();
metal_descriptor.* = .{ metal_descriptor.* = .{
.layer = layer, .layer = layer,
}; };
surface_descriptor.next_in_chain = .{ .from_metal_layer = metal_descriptor }; surface_descriptor.next_in_chain = .{ .from_metal_layer = metal_descriptor };
const screen = objc.appkit.ns.Screen.mainScreen(); const screen = objc.app_kit.Screen.mainScreen();
const rect = objc.core_graphics.cg.Rect{ // TODO: use a meaningful rect const rect = objc.core_graphics.Rect{ // TODO: use a meaningful rect
.origin = .{ .x = 100, .y = 100 }, .origin = .{ .x = 100, .y = 100 },
.size = .{ .width = 480, .height = 270 }, .size = .{ .width = 480, .height = 270 },
}; };
const window_style = const window_style =
(if (options.display_mode == .fullscreen) objc.appkit.ns.WindowStyleMaskFullScreen else 0) | (if (options.display_mode == .fullscreen) objc.app_kit.WindowStyleMaskFullScreen else 0) |
(if (options.display_mode == .windowed) objc.appkit.ns.WindowStyleMaskTitled else 0) | (if (options.display_mode == .windowed) objc.app_kit.WindowStyleMaskTitled else 0) |
(if (options.display_mode == .windowed) objc.appkit.ns.WindowStyleMaskClosable else 0) | (if (options.display_mode == .windowed) objc.app_kit.WindowStyleMaskClosable else 0) |
(if (options.display_mode == .windowed) objc.appkit.ns.WindowStyleMaskMiniaturizable else 0) | (if (options.display_mode == .windowed) objc.app_kit.WindowStyleMaskMiniaturizable else 0) |
(if (options.display_mode == .windowed) objc.appkit.ns.WindowStyleMaskResizable else 0); (if (options.display_mode == .windowed) objc.app_kit.WindowStyleMaskResizable else 0);
window = objc.appkit.ns.Window.alloc().initWithContentRect_styleMask_backing_defer_screen(rect, window_style, objc.appkit.ns.BackingStoreBuffered, true, screen); window = objc.app_kit.Window.alloc().initWithContentRect_styleMask_backing_defer_screen(rect, window_style, objc.app_kit.BackingStoreBuffered, true, screen);
window.?.setReleasedWhenClosed(false); window.?.setReleasedWhenClosed(false);
if (window.?.contentView()) |view| { if (window.?.contentView()) |view| {
view.setLayer(@ptrCast(layer)); view.setLayer(@ptrCast(layer));
@ -143,7 +143,7 @@ pub fn init(darwin: *Darwin, options: InitOptions) !void {
} }
pub fn deinit(darwin: *Darwin) void { pub fn deinit(darwin: *Darwin) void {
if (darwin.window) |w| @as(*objc.foundation.ns.ObjectProtocol, @ptrCast(w)).release(); if (darwin.window) |w| @as(*objc.foundation.ObjectProtocol, @ptrCast(w)).release();
return; return;
} }

8
src/sysgpu/metal.zig
View file

@ -1,9 +1,9 @@
const std = @import("std"); const std = @import("std");
const ca = @import("objc").quartz_core.ca; const ca = @import("objc").quartz_core;
const cg = @import("objc").core_graphics.cg; const cg = @import("objc").core_graphics;
const mtl = @import("objc").metal.mtl; const mtl = @import("objc").metal;
const objc = @import("objc").objc; const objc = @import("objc").objc;
const ns = @import("objc").foundation.ns; const ns = @import("objc").foundation;
const sysgpu = @import("sysgpu/main.zig"); const sysgpu = @import("sysgpu/main.zig");
const limits = @import("limits.zig"); const limits = @import("limits.zig");
const utils = @import("utils.zig"); const utils = @import("utils.zig");

2
src/sysgpu/metal/conv.zig
View file

@ -1,4 +1,4 @@
const mtl = @import("objc").metal.mtl; const mtl = @import("objc").metal;
const sysgpu = @import("../sysgpu/main.zig"); const sysgpu = @import("../sysgpu/main.zig");
pub fn metalBlendFactor(factor: sysgpu.BlendFactor, color: bool) mtl.BlendFactor { pub fn metalBlendFactor(factor: sysgpu.BlendFactor, color: bool) mtl.BlendFactor {