mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 21:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create input_overlay_load_texture_image

Browse Source
This commit is contained in:
twinaphex 2015-03-20 04:12:17 +01:00
parent 1457e50ae5
commit b97ea7bc8d
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
input/input_overlay.c
View File

@ -147,6 +147,20 @@ static void input_overlay_free_overlays(input_overlay_t *ol)
free(ol->overlays); free(ol->overlays);
} }
static bool input_overlay_load_texture_image(struct overlay *overlay,
struct texture_image *image, const char *path)
{
struct texture_image img = {0};
if (!texture_image_load(&img, path))
return false;
*image = img;
overlay->load_images[overlay->load_images_size++] = *image;
return true;
}
static bool input_overlay_load_desc_image(input_overlay_t *ol, static bool input_overlay_load_desc_image(input_overlay_t *ol,
struct overlay_desc *desc, struct overlay_desc *desc,
struct overlay *input_overlay, struct overlay *input_overlay,
@ -169,17 +183,11 @@ static bool input_overlay_load_desc_image(input_overlay_t *ol,
image_path, sizeof(image_path))) image_path, sizeof(image_path)))
{ {
char path[PATH_MAX_LENGTH]; char path[PATH_MAX_LENGTH];
struct texture_image img = {0};
fill_pathname_resolve_relative(path, ol->overlay_path, fill_pathname_resolve_relative(path, ol->overlay_path,
image_path, sizeof(path)); image_path, sizeof(path));
if (texture_image_load(&img, path)) if (input_overlay_load_texture_image(input_overlay, &desc->image, path))
{ desc->image_index = input_overlay->load_images_size - 1;
desc->image = img;
desc->image_index = input_overlay->load_images_size;
input_overlay->load_images[input_overlay->load_images_size++] = desc->image;
}
} }
input_overlay->pos ++; input_overlay->pos ++;
@ -652,12 +660,11 @@ bool input_overlay_load_overlays(input_overlay_t *ol)
if (overlay->config.paths.path[0] != '\0') if (overlay->config.paths.path[0] != '\0')
{ {
char overlay_resolved_path[PATH_MAX_LENGTH]; char overlay_resolved_path[PATH_MAX_LENGTH];
struct texture_image img = {0};
fill_pathname_resolve_relative(overlay_resolved_path, ol->overlay_path, fill_pathname_resolve_relative(overlay_resolved_path, ol->overlay_path,
overlay->config.paths.path, sizeof(overlay_resolved_path)); overlay->config.paths.path, sizeof(overlay_resolved_path));
if (!texture_image_load(&img, overlay_resolved_path)) if (!input_overlay_load_texture_image(overlay, &overlay->image, overlay_resolved_path))
{ {
RARCH_ERR("[Overlay]: Failed to load image: %s.\n", RARCH_ERR("[Overlay]: Failed to load image: %s.\n",
overlay_resolved_path); overlay_resolved_path);
@ -665,8 +672,6 @@ bool input_overlay_load_overlays(input_overlay_t *ol)
goto error; goto error;
} }
overlay->image = img;
overlay->load_images[overlay->load_images_size++] = overlay->image;
} }
snprintf(overlay->config.names.key, sizeof(overlay->config.names.key), snprintf(overlay->config.names.key, sizeof(overlay->config.names.key),