mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-06-04 19:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

font: coretext shaper owns the cf release pool

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-06-22 20:32:24 -07:00
parent 3038cb4979
commit 4325dc51bc
3 changed files with 79 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/renderer/Metal.zig
View File

@@ -1018,9 +1018,6 @@ pub fn updateFrame(
if (critical.preedit) |p| p.deinit(self.alloc);
}
var cf_release_pool = std.ArrayList(*anyopaque).init(self.alloc);
try cf_release_pool.ensureTotalCapacity(state.terminal.rows * 8);
// Build our GPU cells
try self.rebuildCells(
critical.full_rebuild,
@@ -1029,27 +1026,23 @@ pub fn updateFrame(
critical.preedit,
critical.cursor_style,
&critical.color_palette,
&cf_release_pool,
);
if (cf_release_pool.items.len > 0) {
const items = try cf_release_pool.toOwnedSlice();
if (self.font_shaper.cf_release_pool.items.len > 0) {
const alloc = self.font_shaper.alloc;
const items = try self.font_shaper.cf_release_pool.toOwnedSlice(alloc);
if (self.cf_release_thread.mailbox.push(
.{ .release = .{
.refs = items,
.alloc = self.alloc,
.alloc = alloc,
} },
.{ .forever = {} },
) != 0) {
try self.cf_release_thread.wakeup.notify();
} else {
for (items) |ref| {
macos.foundation.CFRelease(ref);
}
self.alloc.free(items);
for (items) |ref| macos.foundation.CFRelease(ref);
alloc.free(items);
}
} else {
cf_release_pool.deinit();
}
// Update our viewport pin
@@ -1931,7 +1924,6 @@ fn rebuildCells(
preedit: ?renderer.State.Preedit,
cursor_style_: ?renderer.CursorStyle,
color_palette: *const terminal.color.Palette,
cf_release_pool: *std.ArrayList(*anyopaque),
) !void {
// const start = try std.time.Instant.now();
// const start_micro = std.time.microTimestamp();
@@ -2013,10 +2005,7 @@ fn rebuildCells(
while (try iter.next(self.alloc)) |run| {
// Try to read the cells from the shaping cache if we can.
const shaper_cells = self.font_shaper_cache.get(run) orelse cache: {
const cells = if (font.options.backend == .coretext)
try self.font_shaper.shape(run, cf_release_pool)
else
try self.font_shaper.shape(run);
const cells = try self.font_shaper.shape(run);
// Try to cache them. If caching fails for any reason we continue
// because it is just a performance optimization, not a correctness

11
src/renderer/OpenGL.zig
View File

@@ -1025,16 +1025,7 @@ pub fn rebuildCells(
while (try iter.next(self.alloc)) |run| {
// Try to read the cells from the shaping cache if we can.
const shaper_cells = self.font_shaper_cache.get(run) orelse cache: {
const cells = if (font.options.backend == .coretext) ct: {
var cf_release_pool = std.ArrayList(*anyopaque).init(self.alloc);
defer {
for (cf_release_pool.items) |ref| {
@import("macos").foundation.CFRelease(ref);
}
cf_release_pool.deinit();
}
break :ct try self.font_shaper.shape(run, &cf_release_pool);
} else try self.font_shaper.shape(run);
const cells = try self.font_shaper.shape(run);
// Try to cache them. If caching fails for any reason we continue
// because it is just a performance optimization, not a correctness