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

renderer/metal: use release() consistently

Browse Source 
I’m not sure why this variation was here previously – maybe it
predated the introduction of `release()`?
This commit is contained in:
Emily
2024-11-03 21:54:38 +00:00
parent 9665ff8945
commit e5f9f222b2
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/renderer/Metal.zig
View File

@ -177,7 +177,7 @@ pub const GPUState = struct {
pub fn init() !GPUState { pub fn init() !GPUState {
const device = objc.Object.fromId(mtl.MTLCreateSystemDefaultDevice()); const device = objc.Object.fromId(mtl.MTLCreateSystemDefaultDevice());
const queue = device.msgSend(objc.Object, objc.sel("newCommandQueue"), .{}); const queue = device.msgSend(objc.Object, objc.sel("newCommandQueue"), .{});
errdefer queue.msgSend(void, objc.sel("release"), .{}); errdefer queue.release();
var instance = try InstanceBuffer.initFill(device, &.{ var instance = try InstanceBuffer.initFill(device, &.{
0, 1, 3, // Top-left triangle 0, 1, 3, // Top-left triangle
@ -206,7 +206,7 @@ pub const GPUState = struct {
for (0..BufferCount) |_| self.frame_sema.wait(); for (0..BufferCount) |_| self.frame_sema.wait();
for (&self.frames) |*frame| frame.deinit(); for (&self.frames) |*frame| frame.deinit();
self.instance.deinit(); self.instance.deinit();
self.queue.msgSend(void, objc.sel("release"), .{}); self.queue.release();
} }
/// Get the next frame state to draw to. This will wait on the /// Get the next frame state to draw to. This will wait on the
@ -269,13 +269,13 @@ pub const FrameState = struct {
.size = 8, .size = 8,
.format = .grayscale, .format = .grayscale,
}); });
errdefer deinitMTLResource(grayscale); errdefer grayscale.release();
const color = try initAtlasTexture(device, &.{ const color = try initAtlasTexture(device, &.{
.data = undefined, .data = undefined,
.size = 8, .size = 8,
.format = .rgba, .format = .rgba,
}); });
errdefer deinitMTLResource(color); errdefer color.release();
return .{ return .{
.uniforms = uniforms, .uniforms = uniforms,
@ -290,8 +290,8 @@ pub const FrameState = struct {
self.uniforms.deinit(); self.uniforms.deinit();
self.cells.deinit(); self.cells.deinit();
self.cells_bg.deinit(); self.cells_bg.deinit();
deinitMTLResource(self.grayscale); self.grayscale.release();
deinitMTLResource(self.color); self.color.release();
} }
}; };
@ -319,8 +319,8 @@ pub const CustomShaderState = struct {
} }
pub fn deinit(self: *CustomShaderState) void { pub fn deinit(self: *CustomShaderState) void {
deinitMTLResource(self.front_texture); self.front_texture.release();
deinitMTLResource(self.back_texture); self.back_texture.release();
self.sampler.deinit(); self.sampler.deinit();
} }
}; };
@ -2057,8 +2057,8 @@ pub fn setScreenSize(
// Only free our previous texture if this isn't our first // Only free our previous texture if this isn't our first
// time setting the custom shader state. // time setting the custom shader state.
if (state.uniforms.resolution[0] > 0) { if (state.uniforms.resolution[0] > 0) {
deinitMTLResource(state.front_texture); state.front_texture.release();
deinitMTLResource(state.back_texture); state.back_texture.release();
} }
state.uniforms.resolution = .{ state.uniforms.resolution = .{
@ -2982,7 +2982,7 @@ fn syncAtlasTexture(device: objc.Object, atlas: *const font.Atlas, texture: *obj
const width = texture.getProperty(c_ulong, "width"); const width = texture.getProperty(c_ulong, "width");
if (atlas.size > width) { if (atlas.size > width) {
// Free our old texture // Free our old texture
deinitMTLResource(texture.*); texture.*.release();
// Reallocate // Reallocate
texture.* = try initAtlasTexture(device, atlas); texture.* = try initAtlasTexture(device, atlas);
@ -3049,12 +3049,6 @@ fn initAtlasTexture(device: objc.Object, atlas: *const font.Atlas) !objc.Object
return objc.Object.fromId(id); return objc.Object.fromId(id);
} }
/// Deinitialize a metal resource (buffer, texture, etc.) and free the
/// memory associated with it.
fn deinitMTLResource(obj: objc.Object) void {
obj.msgSend(void, objc.sel("release"), .{});
}
test { test {
_ = mtl_cell; _ = mtl_cell;
} }