mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-17 20:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify input_overlay.c

Browse Source
This commit is contained in:
twinaphex 2015-03-19 22:52:15 +01:00
parent 21c835bd40
commit ada29dcbd6
1 changed files with 25 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
input/input_overlay.c
View File

@ -321,42 +321,6 @@ end:
return ret; return ret;
} }
static int input_overlay_load_overlay(input_overlay_t *ol,
const char *config_path,
struct overlay *overlay, unsigned idx)
{
if(overlay->pos < overlay->size)
{
if (!input_overlay_load_desc(ol, &overlay->descs[overlay->pos], idx, overlay->pos,
overlay->image.width, overlay->image.height,
overlay->config.normalized,
overlay->config.alpha_mod, overlay->config.range_mod))
{
RARCH_ERR("[Overlay]: Failed to load overlay descs for overlay #%u.\n",
(unsigned)overlay->pos);
goto error;
}
if (overlay->descs[overlay->pos].image.pixels)
{
overlay->descs[overlay->pos].image_index = overlay->load_images_size;
overlay->load_images[overlay->load_images_size++] = overlay->descs[overlay->pos].image;
}
overlay->pos ++;
}
else
{
overlay->pos = 0;
ol->loading_status = OVERLAY_IMAGE_TRANSFER_DESC_DONE;
return 1;
}
return 0;
error:
return -1;
}
static ssize_t input_overlay_find_index(const struct overlay *ol, static ssize_t input_overlay_find_index(const struct overlay *ol,
const char *name, size_t size) const char *name, size_t size)
{ {
@ -509,19 +473,37 @@ bool input_overlay_load_overlays_iterate(input_overlay_t *ol)
case OVERLAY_IMAGE_TRANSFER_DESC_ITERATE: case OVERLAY_IMAGE_TRANSFER_DESC_ITERATE:
{ {
struct overlay *overlay = &ol->overlays[ol->pos]; struct overlay *overlay = &ol->overlays[ol->pos];
for (i = 0; i < overlay->pos_increment; i++) for (i = 0; i < overlay->pos_increment; i++)
{ {
int ret = input_overlay_load_overlay(ol, unsigned idx = ol->pos;
ol->overlay_path, overlay, ol->pos);
if (ret == -1) if (overlay->pos < overlay->size)
{ {
RARCH_ERR("[Overlay]: Failed to load overlay #%u.\n", (unsigned)ol->pos); if (!input_overlay_load_desc(ol, &overlay->descs[overlay->pos], idx, overlay->pos,
goto error; overlay->image.width, overlay->image.height,
overlay->config.normalized,
overlay->config.alpha_mod, overlay->config.range_mod))
{
RARCH_ERR("[Overlay]: Failed to load overlay descs for overlay #%u.\n",
(unsigned)overlay->pos);
goto error;
}
if (overlay->descs[overlay->pos].image.pixels)
{
overlay->descs[overlay->pos].image_index = overlay->load_images_size;
overlay->load_images[overlay->load_images_size++] = overlay->descs[overlay->pos].image;
}
overlay->pos ++;
}
else
{
overlay->pos = 0;
ol->loading_status = OVERLAY_IMAGE_TRANSFER_DESC_DONE;
break;
} }
if (ret == 1)
break;
} }
} }
break; break;