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

Merge pull request #2100 from qwerasd205/mac-opengl

Browse Source 
macos/opengl: lock context while rendering to stop resize crashes
This commit is contained in:
Mitchell Hashimoto
2024-08-15 14:25:20 -07:00
committed by GitHub
parent 9cf6dd845c bc667714dd
commit 78e9e9f93a
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.zig
View File

@ -1117,6 +1117,10 @@ fn addDeps(
step.root_module.addImport("macos", macos_dep.module("macos"));
step.linkLibrary(macos_dep.artifact("macos"));
try static_libs.append(macos_dep.artifact("macos").getEmittedBin());
if (config.renderer == .opengl) {
step.linkFramework("OpenGL");
}
}
// cimgui

14
src/renderer/OpenGL.zig
View File

@ -2030,6 +2030,20 @@ pub fn drawFrame(self: *OpenGL, surface: *apprt.Surface) !void {
}
}
// In the "OpenGL Programming Guide for Mac" it explains that: "When you
// use an NSOpenGLView object with OpenGL calls that are issued from a
// thread other than the main one, you must set up mutex locking."
// This locks the context and avoids crashes that can happen due to
// races with the underlying Metal layer that Apple is using to
// implement OpenGL.
const is_darwin = builtin.target.isDarwin();
const ogl = if (comptime is_darwin) @cImport({
@cInclude("OpenGL/OpenGL.h");
}) else {};
const cgl_ctx = if (comptime is_darwin) ogl.CGLGetCurrentContext();
if (comptime is_darwin) _ = ogl.CGLLockContext(cgl_ctx);
defer _ = if (comptime is_darwin) ogl.CGLUnlockContext(cgl_ctx);
// Draw our terminal cells
try self.drawCellProgram(gl_state);