From d0f76a4029a775990fb80eeb8fed45c05921c1cc Mon Sep 17 00:00:00 2001
From: ACrazyTown <47027981+ACrazyTown@users.noreply.github.com>
Date: Thu, 14 May 2026 18:57:31 +0200
Subject: [PATCH 1/2] Add support for VAOs on macOS

---
 .../src/graphics/opengl/OpenGLBindings.cpp    | 60 ++++++++++++++++++-
 1 file changed, 58 insertions(+), 2 deletions(-)

diff --git a/project/src/graphics/opengl/OpenGLBindings.cpp b/project/src/graphics/opengl/OpenGLBindings.cpp
index dbcc4f1aec..d571b3d87d 100644
--- a/project/src/graphics/opengl/OpenGLBindings.cpp
+++ b/project/src/graphics/opengl/OpenGLBindings.cpp
@@ -531,6 +531,12 @@ namespace lime {
 	void lime_gl_bind_vertex_array (int vertexArray) {
 
 		#if defined (LIME_GLES3_API) || !defined (LIME_GLES)
+		#if defined (HX_MACOS)
+		if (glBindVertexArrayAPPLE) {
+			glBindVertexArrayAPPLE (vertexArray);
+		}
+		else
+		#endif
 		if (glBindVertexArray) {
 			glBindVertexArray (vertexArray);
 		}
@@ -542,6 +548,12 @@ namespace lime {
 	HL_PRIM void HL_NAME(hl_gl_bind_vertex_array) (int vertexArray) {
 
 		#if defined (LIME_GLES3_API) || !defined (LIME_GLES)
+		#if defined (HX_MACOS)
+		if (glBindVertexArrayAPPLE) {
+			glBindVertexArrayAPPLE (vertexArray);
+		}
+		else
+		#endif
 		if (glBindVertexArray) {
 			glBindVertexArray (vertexArray);
 		}
@@ -1200,6 +1212,12 @@ namespace lime {
 
 		GLuint id = 0;
 		#if defined (LIME_GLES3_API) || !defined (LIME_GLES)
+		#if defined (HX_MACOS)
+		if (glGenVertexArraysAPPLE) {
+			glGenVertexArraysAPPLE (1, &id);
+		}
+		else
+		#endif
 		if (glGenVertexArrays) {
 			glGenVertexArrays (1, &id);
 		}
@@ -1213,6 +1231,12 @@ namespace lime {
 
 		GLuint id = 0;
 		#if defined (LIME_GLES3_API) || !defined (LIME_GLES)
+		#if defined (HX_MACOS)
+		if (glGenVertexArraysAPPLE) {
+			glGenVertexArraysAPPLE (1, &id);
+		}
+		else
+		#endif
 		if (glGenVertexArrays) {
 			glGenVertexArrays (1, &id);
 		}
@@ -1401,6 +1425,12 @@ namespace lime {
 	void lime_gl_delete_vertex_array (int vertexArray) {
 
 		#if defined (LIME_GLES3_API) || !defined (LIME_GLES)
+		#if defined (HX_MACOS)
+		if (glDeleteVertexArraysAPPLE) {
+			glDeleteVertexArraysAPPLE (1, (GLuint*)&vertexArray);
+		}
+		else
+		#endif
 		if (glDeleteVertexArrays) {
 			glDeleteVertexArrays (1, (GLuint*)&vertexArray);
 		}
@@ -1412,6 +1442,12 @@ namespace lime {
 	HL_PRIM void HL_NAME(hl_gl_delete_vertex_array) (int vertexArray) {
 
 		#if defined (LIME_GLES3_API) || !defined (LIME_GLES)
+		#if defined (HX_MACOS)
+		if (glDeleteVertexArraysAPPLE) {
+			glDeleteVertexArraysAPPLE (1, (GLuint*)&vertexArray);
+		}
+		else
+		#endif
 		if (glDeleteVertexArrays) {
 			glDeleteVertexArrays (1, (GLuint*)&vertexArray);
 		}
@@ -3880,7 +3916,17 @@ namespace lime {
 	bool lime_gl_is_vertex_array (int handle) {
 
 		#if defined (LIME_GLES3_API) || !defined (LIME_GLES)
-		return glIsVertexArray ? glIsVertexArray (handle) : false;
+		#if defined (HX_MACOS)
+		if (glIsVertexArrayAPPLE) {
+			return glIsVertexArrayAPPLE (handle);
+		}
+		else
+		#endif
+		if (glIsVertexArray) {
+			return glIsVertexArray (handle);
+		}
+
+		return false;
 		#else
 		return false;
 		#endif
@@ -3891,7 +3937,17 @@ namespace lime {
 	HL_PRIM bool HL_NAME(hl_gl_is_vertex_array) (int handle) {
 
 		#if defined (LIME_GLES3_API) || !defined (LIME_GLES)
-		return glIsVertexArray ? glIsVertexArray (handle) : false;
+		#if defined (HX_MACOS)
+		if (glIsVertexArrayAPPLE) {
+			return glIsVertexArrayAPPLE (handle);
+		}
+		else
+		#endif
+		if (glIsVertexArray) {
+			return glIsVertexArray (handle);
+		}
+
+		return false;
 		#else
 		return false;
 		#endif

From a32ca8310476d4c1640ca5023956ab55ef1df834 Mon Sep 17 00:00:00 2001
From: ACrazyTown <47027981+ACrazyTown@users.noreply.github.com>
Date: Thu, 14 May 2026 19:21:05 +0200
Subject: [PATCH 2/2] Fix GC not picking up some GL objects on desktop

---
 .../src/graphics/opengl/OpenGLBindings.cpp    | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/project/src/graphics/opengl/OpenGLBindings.cpp b/project/src/graphics/opengl/OpenGLBindings.cpp
index d571b3d87d..4bcd72a01c 100644
--- a/project/src/graphics/opengl/OpenGLBindings.cpp
+++ b/project/src/graphics/opengl/OpenGLBindings.cpp
@@ -228,10 +228,13 @@ namespace lime {
 						if (glIsRenderbuffer (id)) glDeleteRenderbuffers (1, &id);
 						break;
 
-					#ifdef LIME_GLES3_API
+					#if defined(LIME_GLES3_API) || !defined(LIME_GLES)
 					case TYPE_SAMPLER:
 
-						if (glIsSampler (id)) glDeleteSamplers (1, &id);
+						if (glIsSampler && glIsSampler (id)) {
+							if (glDeleteSamplers)
+								glDeleteSamplers (1, &id);
+						}
 						break;
 					#endif
 
@@ -245,10 +248,20 @@ namespace lime {
 						if (glIsTexture (id)) glDeleteTextures (1, &id);
 						break;
 
-					#ifdef LIME_GLES3_API
+					#if defined(LIME_GLES3_API) || !defined(LIME_GLES)
 					case TYPE_VERTEX_ARRAY_OBJECT:
-
-						if (glIsVertexArray (id)) glDeleteVertexArrays (1, &id);
+					
+						#if defined(HX_MACOS)
+						if (glIsVertexArrayAPPLE && glIsVertexArrayAPPLE (id)) {
+							if (glDeleteVertexArraysAPPLE)
+								glDeleteVertexArraysAPPLE (1, &id);
+						}
+						else
+						#endif
+						if (glIsVertexArray && glIsVertexArray (id)) {
+							if (glDeleteVertexArrays)
+								glDeleteVertexArrays (1, &id);
+						}
 						break;
 					#endif