From 57d850822e0c2261b6ba3cc3246c307df6b6f875 Mon Sep 17 00:00:00 2001
From: Qwerasd <qwerasd205@users.noreply.github.com>
Date: Wed, 14 Aug 2024 23:43:17 -0400
Subject: [PATCH] macos/opengl: lock context while rendering to stop resize
 crashes

---
 build.zig               | 4 ++++
 src/renderer/OpenGL.zig | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/build.zig b/build.zig
index 3b2f9028c..0165de802 100644
--- a/build.zig
+++ b/build.zig
@@ -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
diff --git a/src/renderer/OpenGL.zig b/src/renderer/OpenGL.zig
index 498a1e967..1f7fb1ea2 100644
--- a/src/renderer/OpenGL.zig
+++ b/src/renderer/OpenGL.zig
@@ -2030,6 +2030,14 @@ pub fn drawFrame(self: *OpenGL, surface: *apprt.Surface) !void {
         }
     }
 
+    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);