Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-16 08:46:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

renderer/opengl: use shaper cache

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-05-01 19:43:48 -07:00
parent d7de26ef58
commit 406824bcd4
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/renderer/OpenGL.zig
View File

@ -74,6 +74,7 @@ gl_state: ?GLState = null,
/// The font structures. /// The font structures.
font_grid: *font.SharedGrid, font_grid: *font.SharedGrid,
font_shaper: font.Shaper, font_shaper: font.Shaper,
font_shaper_cache: font.ShaperCache,
texture_greyscale_modified: usize = 0, texture_greyscale_modified: usize = 0,
texture_greyscale_resized: usize = 0, texture_greyscale_resized: usize = 0,
texture_color_modified: usize = 0, texture_color_modified: usize = 0,
@ -345,6 +346,7 @@ pub fn init(alloc: Allocator, options: renderer.Options) !OpenGL {
.gl_state = gl_state, .gl_state = gl_state,
.font_grid = grid, .font_grid = grid,
.font_shaper = shaper, .font_shaper = shaper,
.font_shaper_cache = font.ShaperCache.init(),
.draw_background = options.config.background, .draw_background = options.config.background,
.focused = true, .focused = true,
.foreground_color = options.config.foreground, .foreground_color = options.config.foreground,
@ -359,6 +361,7 @@ pub fn init(alloc: Allocator, options: renderer.Options) !OpenGL {
pub fn deinit(self: *OpenGL) void { pub fn deinit(self: *OpenGL) void {
self.font_shaper.deinit(); self.font_shaper.deinit();
self.font_shaper_cache.deinit(self.alloc);
{ {
var it = self.images.iterator(); var it = self.images.iterator();
@ -1013,7 +1016,24 @@ pub fn rebuildCells(
if (shape_cursor) screen.cursor.x else null, if (shape_cursor) screen.cursor.x else null,
); );
while (try iter.next(self.alloc)) |run| { while (try iter.next(self.alloc)) |run| {
for (try self.font_shaper.shape(run)) |shaper_cell| { // 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 = 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
// issue.
self.font_shaper_cache.put(self.alloc, run, cells) catch |err| {
log.warn("error caching font shaping results err={}", .{err});
};
// The cells we get from direct shaping are always owned by
// the shaper and valid until the next shaping call so we can
// just return them.
break :cache cells;
};
for (shaper_cells) |shaper_cell| {
// If this cell falls within our preedit range then we skip it. // If this cell falls within our preedit range then we skip it.
// We do this so we don't have conflicting data on the same // We do this so we don't have conflicting data on the same
// cell. // cell.