From c2e0e2b994bd723f8b2e9cfd606168ac8e18f005 Mon Sep 17 00:00:00 2001
From: Hanspeter Portner <dev@open-music-kontrollers.ch>
Date: Wed, 14 Jul 2021 23:06:42 +0200
Subject: [PATCH] Squashed 'canvas.lv2/' changes from b700b88..9312797

9312797 add define to skip nanovg implementation.
0263395 include render_cairo.h in idisp.h.

git-subtree-dir: canvas.lv2
git-subtree-split: 93127979df1af3f7e5f8ef4f255ba2d6366d893c
---
 canvas.lv2/idisp.h         | 3 +--
 canvas.lv2/render_nanovg.h | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/canvas.lv2/idisp.h b/canvas.lv2/idisp.h
index d61b479..7ff24fa 100644
--- a/canvas.lv2/idisp.h
+++ b/canvas.lv2/idisp.h
@@ -22,8 +22,7 @@
 extern "C" {
 #endif
 
-#define LV2_CANVAS_RENDER_CAIRO
-#include <canvas.lv2/render.h>
+#include <canvas.lv2/render_cairo.h>
 #include <canvas.lv2/lv2_extensions.h>
 
 typedef struct _LV2_Canvas_Idisp LV2_Canvas_Idisp;
diff --git a/canvas.lv2/render_nanovg.h b/canvas.lv2/render_nanovg.h
index 7280153..3449d4a 100644
--- a/canvas.lv2/render_nanovg.h
+++ b/canvas.lv2/render_nanovg.h
@@ -31,7 +31,10 @@
 #	include <GL/glew.h>
 #endif
 
-#define NANOVG_GLES3_IMPLEMENTATION
+#if !defined(LV2_CANVAS_RENDER_NANOVG_NO_IMPLEMENTATION)
+#	define NANOVG_GLES3_IMPLEMENTATION
+#endif
+
 #include <nanovg_gl.h>
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsign-compare"
-- 
2.38.5