From 11c532346a6a5a08e64d60312db808620c70a264 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Fri, 27 Aug 2021 14:57:22 +0100
Subject: [PATCH] Use nanovg in GL3 mode when DGL_USE_OPENGL3 is defined

---
 dgl/src/NanoVG.cpp         | 13 ++++++++++++-
 dgl/src/nanovg/nanovg_gl.h |  4 +++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/dgl/src/NanoVG.cpp b/dgl/src/NanoVG.cpp
index 7002a558..d6c78f1e 100644
--- a/dgl/src/NanoVG.cpp
+++ b/dgl/src/NanoVG.cpp
@@ -61,7 +61,18 @@ DGL_EXT(PFNGLBLENDFUNCSEPARATEPROC,        glBlendFuncSeparate)
 // Include NanoVG OpenGL implementation
 
 //#define STB_IMAGE_STATIC
-#define NANOVG_GL2_IMPLEMENTATION
+#ifdef DGL_USE_OPENGL3
+# define NANOVG_GL3_IMPLEMENTATION
+#else
+# define NANOVG_GL2_IMPLEMENTATION
+#endif
+
+#if defined(DISTRHO_OS_MAC) && defined(NANOVG_GL3_IMPLEMENTATION)
+# define glBindVertexArray glBindVertexArrayAPPLE
+# define glDeleteVertexArrays glDeleteVertexArraysAPPLE
+# define glGenVertexArrays glGenVertexArraysAPPLE
+#endif
+
 #include "nanovg/nanovg_gl.h"
 
 #if defined(NANOVG_GL2)
diff --git a/dgl/src/nanovg/nanovg_gl.h b/dgl/src/nanovg/nanovg_gl.h
index 798b2369..b69fc305 100644
--- a/dgl/src/nanovg/nanovg_gl.h
+++ b/dgl/src/nanovg/nanovg_gl.h
@@ -40,7 +40,9 @@ enum NVGcreateFlags {
 #elif defined NANOVG_GL3_IMPLEMENTATION
 #  define NANOVG_GL3 1
 #  define NANOVG_GL_IMPLEMENTATION 1
-#  define NANOVG_GL_USE_UNIFORMBUFFER 1
+#  ifndef __APPLE__
+#   define NANOVG_GL_USE_UNIFORMBUFFER 1
+#  endif
 #elif defined NANOVG_GLES2_IMPLEMENTATION
 #  define NANOVG_GLES2 1
 #  define NANOVG_GL_IMPLEMENTATION 1