From 7cb3f2ede4fd7274458f7822235f01d23030ff2d Mon Sep 17 00:00:00 2001 From: clint Date: Wed, 5 Jan 2022 10:51:45 -0500 Subject: [PATCH 1/2] Restore previous shader program on flush/endFrame. --- src/nanovg_gl.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/nanovg_gl.h b/src/nanovg_gl.h index 798b2369..edcf9a7d 100644 --- a/src/nanovg_gl.h +++ b/src/nanovg_gl.h @@ -1180,9 +1180,10 @@ static void glnvg__renderFlush(void* uptr) { GLNVGcontext* gl = (GLNVGcontext*)uptr; int i; - + if (gl->ncalls > 0) { - + GLuint lastProgram = 0; + glGetIntegerv(GL_CURRENT_PROGRAM, (GLint*)&lastProgram); // Setup require GL state. glUseProgram(gl->shader.prog); @@ -1255,7 +1256,7 @@ static void glnvg__renderFlush(void* uptr) #endif glDisable(GL_CULL_FACE); glBindBuffer(GL_ARRAY_BUFFER, 0); - glUseProgram(0); + glUseProgram(lastProgram); glnvg__bindTexture(gl, 0); } From 5501dfa808a9c8a74b7c536a8335817ec38d3161 Mon Sep 17 00:00:00 2001 From: clint Date: Wed, 5 Jan 2022 11:05:39 -0500 Subject: [PATCH 2/2] Remove tab. --- src/nanovg_gl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nanovg_gl.h b/src/nanovg_gl.h index edcf9a7d..7eade902 100644 --- a/src/nanovg_gl.h +++ b/src/nanovg_gl.h @@ -1180,7 +1180,7 @@ static void glnvg__renderFlush(void* uptr) { GLNVGcontext* gl = (GLNVGcontext*)uptr; int i; - + if (gl->ncalls > 0) { GLuint lastProgram = 0; glGetIntegerv(GL_CURRENT_PROGRAM, (GLint*)&lastProgram);