From a23e6c481821e8de904585026d7cacdb602881c0 Mon Sep 17 00:00:00 2001 From: Christopher Maughan Date: Sat, 21 Jun 2014 11:07:05 +0100 Subject: [PATCH] Also set the mipmap flag for GL ;) --- src/nanovg_gl.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/nanovg_gl.h b/src/nanovg_gl.h index f80de21..450e7b9 100644 --- a/src/nanovg_gl.h +++ b/src/nanovg_gl.h @@ -643,9 +643,16 @@ static int glnvg__renderCreateTexture(void* uptr, int type, int w, int h, int im glTexImage2D(GL_TEXTURE_2D, 0, GL_RED, w, h, 0, GL_RED, GL_UNSIGNED_BYTE, data); #endif - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - + if (imageFlags & NVG_IMAGE_GENERATE_MIPMAPS) + { + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); + } + else + { + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + } + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glPixelStorei(GL_UNPACK_ALIGNMENT, 4); #ifndef NANOVG_GLES2 glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);