From ad59d66bf0d7cfe098f5e0390d22ade3ad2d52ab Mon Sep 17 00:00:00 2001 From: Andrew Corrigan Date: Thu, 26 Jun 2014 20:16:26 -0400 Subject: [PATCH 1/3] only specifies precision for fragment shader, vertex shader defaults to highp as per gles2/gles3 spec --- src/nanovg_gl.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/nanovg_gl.h b/src/nanovg_gl.h index 044a2b9..724d17b 100644 --- a/src/nanovg_gl.h +++ b/src/nanovg_gl.h @@ -415,15 +415,9 @@ static int glnvg__renderCreate(void* uptr) "#define NANOVG_GL3 1\n"; #elif defined NANOVG_GLES2 "#version 100\n" - "#ifdef GL_FRAGMENT_PRECISION_HIGH\n" - " precision highp float;\n" - "#else\n" - " precision mediump float;\n" - "#endif\n" "#define NANOVG_GL2 1\n"; #elif defined NANOVG_GLES3 "#version 300 es\n" - "precision highp float;\n" "#define NANOVG_GL3 1\n"; #endif @@ -448,6 +442,13 @@ static int glnvg__renderCreate(void* uptr) "}\n"; static const char* fillFragShader = + "#ifdef GL_ES\n" + "#if defined(GL_FRAGMENT_PRECISION_HIGH) || defined(NANOVG_GL3)\n" + " precision highp float;\n" + "#else\n" + " precision mediump float;\n" + "#endif\n" + "#endif\n" "#ifdef NANOVG_GL3\n" "#ifdef USE_UNIFORMBUFFER\n" " layout(std140) uniform frag {\n" From ad1f260b919a0bc23fa3060ab774bdd9558b39bc Mon Sep 17 00:00:00 2001 From: Andrew Corrigan Date: Fri, 27 Jun 2014 09:20:45 -0400 Subject: [PATCH 2/3] spaces --> tabs --- 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 724d17b..d2ae788 100644 --- a/src/nanovg_gl.h +++ b/src/nanovg_gl.h @@ -443,7 +443,7 @@ static int glnvg__renderCreate(void* uptr) static const char* fillFragShader = "#ifdef GL_ES\n" - "#if defined(GL_FRAGMENT_PRECISION_HIGH) || defined(NANOVG_GL3)\n" + "#if defined(GL_FRAGMENT_PRECISION_HIGH) || defined(NANOVG_GL3)\n" " precision highp float;\n" "#else\n" " precision mediump float;\n" From cb5f9cdd50f4e647a1d8e93189bb14feb854028d Mon Sep 17 00:00:00 2001 From: Andrew Corrigan Date: Fri, 27 Jun 2014 09:21:42 -0400 Subject: [PATCH 3/3] spaces --> tabs --- 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 d2ae788..5a8bd20 100644 --- a/src/nanovg_gl.h +++ b/src/nanovg_gl.h @@ -448,7 +448,7 @@ static int glnvg__renderCreate(void* uptr) "#else\n" " precision mediump float;\n" "#endif\n" - "#endif\n" + "#endif\n" "#ifdef NANOVG_GL3\n" "#ifdef USE_UNIFORMBUFFER\n" " layout(std140) uniform frag {\n"