aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanspeter Portner <dev@open-music-kontrollers.ch>2017-02-14 21:35:36 +0100
committerHanspeter Portner <dev@open-music-kontrollers.ch>2017-02-14 21:35:36 +0100
commit30e846018a05e71c336b12bf1edbaf03edd4306d (patch)
tree995ab293ea3a3431d8626b5a8346eee1c9495e77
parenteb5c8bcef2d16ab942cb8da38bfa692b1d176a61 (diff)
parent977a8162600df041ab1a93df5d5365c276f9b10f (diff)
downloadmidi_matrix.lv2-30e846018a05e71c336b12bf1edbaf03edd4306d.tar.xz
Merge commit '977a8162600df041ab1a93df5d5365c276f9b10f'
-rw-r--r--nk_pugl/nk_pugl.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/nk_pugl/nk_pugl.h b/nk_pugl/nk_pugl.h
index 79006a8..93909c7 100644
--- a/nk_pugl/nk_pugl.h
+++ b/nk_pugl/nk_pugl.h
@@ -1071,15 +1071,15 @@ nk_pugl_icon_load(nk_pugl_window_t *win, const char *filename)
return nk_image_id(tex);
int w, h, n;
- uint8_t *data = stbi_load(filename, &w, &h, &n, 0);
+ uint8_t *data = stbi_load(filename, &w, &h, &n, 4);
if(data)
{
puglEnterContext(win->view);
{
glGenTextures(1, &tex);
glBindTexture(GL_TEXTURE_2D, tex);
- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR_MIPMAP_NEAREST);
+ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
if(!win->glGenerateMipmap) // for GL >= 1.4 && < 3.1