From ac6a6568983a1e925b81ff2b1d14de197937bc01 Mon Sep 17 00:00:00 2001 From: Joshua Ashton Date: Tue, 5 Sep 2017 14:42:27 +0100 Subject: [PATCH] Fix MSVC 2017 compiler warning --- src/nanovg_gl.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/nanovg_gl.h b/src/nanovg_gl.h index a8b788d..a6d5fac 100644 --- a/src/nanovg_gl.h +++ b/src/nanovg_gl.h @@ -945,10 +945,17 @@ static int glnvg__convertPaint(GLNVGcontext* gl, GLNVGfragUniforms* frag, NVGpai } frag->type = NSVG_SHADER_FILLIMG; + #if NANOVG_GL_USE_UNIFORMBUFFER if (tex->type == NVG_TEXTURE_RGBA) frag->texType = (tex->flags & NVG_IMAGE_PREMULTIPLIED) ? 0 : 1; else frag->texType = 2; + #else + if (tex->type == NVG_TEXTURE_RGBA) + frag->texType = (tex->flags & NVG_IMAGE_PREMULTIPLIED) ? 0.0f : 1.0f; + else + frag->texType = 2.0f; + #endif // printf("frag->texType = %d\n", frag->texType); } else { frag->type = NSVG_SHADER_FILLGRAD;