From 14a42fcdb71f17c1362ff8cd122a224fea20aaa6 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Tue, 6 Aug 2024 15:05:10 -0700
Subject: [PATCH] renderer/metal: load shaders from precompiled lib

---
 pkg/macos/dispatch.zig         |  8 ++++++++
 pkg/macos/dispatch/c.zig       |  3 +++
 pkg/macos/dispatch/data.zig    | 31 +++++++++++++++++++++++++++++++
 pkg/macos/dispatch/queue.zig   |  8 ++++++++
 pkg/macos/main.zig             |  1 +
 src/renderer/metal/shaders.zig | 22 ++++++++++++----------
 6 files changed, 63 insertions(+), 10 deletions(-)
 create mode 100644 pkg/macos/dispatch.zig
 create mode 100644 pkg/macos/dispatch/c.zig
 create mode 100644 pkg/macos/dispatch/data.zig
 create mode 100644 pkg/macos/dispatch/queue.zig

diff --git a/pkg/macos/dispatch.zig b/pkg/macos/dispatch.zig
new file mode 100644
index 000000000..9c66b529f
--- /dev/null
+++ b/pkg/macos/dispatch.zig
@@ -0,0 +1,8 @@
+pub const c = @import("dispatch/c.zig");
+pub const data = @import("dispatch/data.zig");
+pub const queue = @import("dispatch/queue.zig");
+pub const Data = data.Data;
+
+test {
+    @import("std").testing.refAllDecls(@This());
+}
diff --git a/pkg/macos/dispatch/c.zig b/pkg/macos/dispatch/c.zig
new file mode 100644
index 000000000..527469765
--- /dev/null
+++ b/pkg/macos/dispatch/c.zig
@@ -0,0 +1,3 @@
+pub usingnamespace @cImport({
+    @cInclude("dispatch/dispatch.h");
+});
diff --git a/pkg/macos/dispatch/data.zig b/pkg/macos/dispatch/data.zig
new file mode 100644
index 000000000..223eabeb1
--- /dev/null
+++ b/pkg/macos/dispatch/data.zig
@@ -0,0 +1,31 @@
+const std = @import("std");
+const foundation = @import("../foundation.zig");
+const c = @import("c.zig");
+
+pub const Data = opaque {
+    pub const DESTRUCTOR_DEFAULT = c.DISPATCH_DATA_DESTRUCTOR_DEFAULT;
+
+    pub fn create(
+        data: []const u8,
+        queue: ?*anyopaque,
+        destructor: ?*anyopaque,
+    ) !*Data {
+        return dispatch_data_create(
+            data.ptr,
+            data.len,
+            queue,
+            destructor,
+        ) orelse return error.OutOfMemory;
+    }
+
+    pub fn release(data: *Data) void {
+        foundation.c.CFRelease(data);
+    }
+};
+
+extern "c" fn dispatch_data_create(
+    data: [*]const u8,
+    len: usize,
+    queue: ?*anyopaque,
+    destructor: ?*anyopaque,
+) ?*Data;
diff --git a/pkg/macos/dispatch/queue.zig b/pkg/macos/dispatch/queue.zig
new file mode 100644
index 000000000..72b6bbaec
--- /dev/null
+++ b/pkg/macos/dispatch/queue.zig
@@ -0,0 +1,8 @@
+const std = @import("std");
+const c = @import("c.zig");
+
+pub const Queue = *anyopaque; // dispatch_queue_t
+
+pub fn getMain() Queue {
+    return c.dispatch_get_main_queue().?;
+}
diff --git a/pkg/macos/main.zig b/pkg/macos/main.zig
index 2b05f11ae..20274e9c0 100644
--- a/pkg/macos/main.zig
+++ b/pkg/macos/main.zig
@@ -1,5 +1,6 @@
 pub const foundation = @import("foundation.zig");
 pub const animation = @import("animation.zig");
+pub const dispatch = @import("dispatch.zig");
 pub const graphics = @import("graphics.zig");
 pub const os = @import("os.zig");
 pub const text = @import("text.zig");
diff --git a/src/renderer/metal/shaders.zig b/src/renderer/metal/shaders.zig
index 0652a3c98..bbaf77dc8 100644
--- a/src/renderer/metal/shaders.zig
+++ b/src/renderer/metal/shaders.zig
@@ -156,27 +156,29 @@ pub const PostUniforms = extern struct {
 
 /// Initialize the MTLLibrary. A MTLLibrary is a collection of shaders.
 fn initLibrary(device: objc.Object) !objc.Object {
-    // Hardcoded since this file isn't meant to be reusable.
-    const data = @embedFile("../shaders/cell.metal");
-    const source = try macos.foundation.String.createWithBytes(
-        data,
-        .utf8,
-        false,
+    const start = try std.time.Instant.now();
+
+    const data = try macos.dispatch.Data.create(
+        @embedFile("../shaders/Ghostty.metallib"),
+        macos.dispatch.queue.getMain(),
+        macos.dispatch.Data.DESTRUCTOR_DEFAULT,
     );
-    defer source.release();
+    defer data.release();
 
     var err: ?*anyopaque = null;
     const library = device.msgSend(
         objc.Object,
-        objc.sel("newLibraryWithSource:options:error:"),
+        objc.sel("newLibraryWithData:error:"),
         .{
-            source,
-            @as(?*anyopaque, null),
+            data,
             &err,
         },
     );
     try checkError(err);
 
+    const end = try std.time.Instant.now();
+    log.debug("shader library loaded time={}us", .{end.since(start) / std.time.ns_per_us});
+
     return library;
 }