libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-01-23 09:55:48 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

(Menu) Uniquely name png_texture_load in lakka and glui

Browse Source
This commit is contained in:
twinaphex 2014-09-14 15:17:03 +02:00
parent 2862b17e07
commit 2d64c7aa8f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/menu/disp/glui.c
View File

@ -327,7 +327,7 @@ static int glui_input_postprocess(uint64_t old_state)
return 0;
}
static GLuint png_texture_load(const char * file_name)
static GLuint glui_png_texture_load(const char * file_name)
{
struct texture_image ti = {0};
texture_image_load(&ti, file_name);
@ -364,7 +364,7 @@ static void glui_context_reset(void *data)
fill_pathname_join(bgpath, bgpath, "bg.png", sizeof(bgpath));
if (path_file_exists(bgpath))
glui_bg = png_texture_load(bgpath);
glui_bg = glui_png_texture_load(bgpath);
}
menu_ctx_driver_t menu_ctx_glui = {

8
frontend/menu/disp/lakka.c
View File

@ -661,7 +661,7 @@ static void lakka_frame(void)
gl_set_viewport(gl, gl->win_width, gl->win_height, false, false);
}
static GLuint png_texture_load(const char * file_name)
static GLuint lakka_png_texture_load(const char * file_name)
{
struct texture_image ti = {0};
texture_image_load(&ti, file_name);
@ -883,7 +883,7 @@ static void lakka_context_reset(void *data)
"reload.png", sizeof(textures[TEXTURE_RELOAD].path));
for (k = 0; k < TEXTURE_LAST; k++)
textures[k].id = png_texture_load(textures[k].path);
textures[k].id = lakka_png_texture_load(textures[k].path);
lakka_settings_context_reset();
for (i = 1; i < num_categories; i++)
@ -926,8 +926,8 @@ static void lakka_context_reset(void *data)
strlcat(content_texturepath, core_id, sizeof(content_texturepath));
strlcat(content_texturepath, "-content.png", sizeof(content_texturepath));
category->icon = png_texture_load(texturepath);
category->item_icon = png_texture_load(content_texturepath);
category->icon = lakka_png_texture_load(texturepath);
category->item_icon = lakka_png_texture_load(content_texturepath);
for (j = 0; j < category->num_items; j++)
{