DPF

commit 299e50f826bfb91c005f52bf9ada7cd69c3f3940
parent a07aaf986f396bf5b014add962b5f38041121fdf
Author: falkTX <falktx@falktx.com>
Date:   Sat,  9 Oct 2021 00:38:01 +0100

Stick with NanoVG, use USE_NANOVG_FBO macro instead

Signed-off-by: falkTX <falktx@falktx.com>

Diffstat:
M
dgl/Makefile
 | 
10
+++++-----
M
dgl/src/NanoVG.cpp
 | 
6
+++++-
M
dgl/src/nanovg/nanovg.c
 | 
3
++-

3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/dgl/Makefile b/dgl/Makefile
@@ -16,6 +16,9 @@ LINK_FLAGS      += $(DGL_LIBS)
 ifeq ($(USE_OPENGL3),true)
 BUILD_CXX_FLAGS += -DDGL_USE_OPENGL3
 endif
+ifneq ($(USE_NANOVG_FBO),true)
+BUILD_CXX_FLAGS += -DDGL_USE_NANOVG_FBO
+endif
 
 # TODO fix these after pugl-upstream is done
 BUILD_CXX_FLAGS += -Wno-attributes -Wno-extra -Wno-missing-field-initializers
@@ -62,11 +65,8 @@ endif
 # ---------------------------------------------------------------------------------------------------------------------
 
 OBJS_opengl = $(OBJS_common) \
-	../build/dgl/OpenGL.cpp.opengl.o
-
-ifneq ($(SKIP_NANOVG),true)
-OBJS_opengl += ../build/dgl/NanoVG.cpp.opengl.o
-endif
+	../build/dgl/OpenGL.cpp.opengl.o \
+	../build/dgl/NanoVG.cpp.opengl.o
 
 ifeq ($(MACOS),true)
 OBJS_opengl += ../build/dgl/pugl.mm.opengl.o
diff --git a/dgl/src/NanoVG.cpp b/dgl/src/NanoVG.cpp
@@ -83,7 +83,11 @@ DGL_EXT(PFNGLUNIFORMBLOCKBINDINGPROC,      glUniformBlockBinding)
 #endif
 
 #include "nanovg/nanovg_gl.h"
-#include "nanovg/nanovg_gl_utils.h"
+
+#ifdef DGL_USE_NANOVG_FBO
+# define NANOVG_FBO_VALID 1
+# include "nanovg/nanovg_gl_utils.h"
+#endif
 
 #if defined(NANOVG_GL2)
 # define nvgCreateGL nvgCreateGL2
diff --git a/dgl/src/nanovg/nanovg.c b/dgl/src/nanovg/nanovg.c
@@ -698,7 +698,8 @@ void nvgLineJoin(NVGcontext* ctx, int join)
 
 void nvgGlobalAlpha(NVGcontext* ctx, float alpha)
 {
-	nvgGlobalTint(ctx, nvgRGBAf(1, 1, 1, alpha));
+	NVGstate* state = nvg__getState(ctx);
+	state->tint.a = alpha;
 }
 
 void nvgGlobalTint(NVGcontext* ctx, NVGcolor tint)