TheCloud/nuklear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #918 from crazyBaboon/master

Browse Source 
comment icon_load() as it is not being used currently
This commit is contained in:
dumblob 2019-10-01 15:10:14 +02:00 committed by GitHub
commit adc52d710f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
example/canvas.c
View File

@ -77,6 +77,8 @@ die(const char *fmt, ...)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
/* function icon_load () is not used to build this file but might still be useful :) */
/*
static struct nk_image static struct nk_image
icon_load(const char *filename) icon_load(const char *filename)
{ {
@ -85,7 +87,7 @@ icon_load(const char *filename)
unsigned char *data = stbi_load(filename, &x, &y, &n, 0); unsigned char *data = stbi_load(filename, &x, &y, &n, 0);
if (!data) die("[SDL]: failed to load image: %s", filename); if (!data) die("[SDL]: failed to load image: %s", filename);
glGenTextures(1, &tex); glGenTextures(1, &tex);
glBindTexture(GL_TEXTURE_2D, tex); glBindTexture(GL_TEXTURE_2D, tex);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST); 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_MAG_FILTER, GL_LINEAR_MIPMAP_NEAREST);
@ -96,6 +98,7 @@ icon_load(const char *filename)
stbi_image_free(data); stbi_image_free(data);
return nk_image_id((int)tex); return nk_image_id((int)tex);
} }
*/
static void static void
device_init(struct device *dev) device_init(struct device *dev)