ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Overlay) input_overlay_load_overlays_iterate - cleanups

This commit is contained in:
twinaphex 2015-03-20 03:30:17 +01:00
parent 2a82d4a3c0
commit 1457e50ae5
1 changed files with 39 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
input/input_overlay.c
View File

@ -457,7 +457,6 @@ error:
static bool input_overlay_load_overlay_image_done(struct overlay *overlay)
{
overlay->pos = 0;
/* Divide iteration steps by half of total descs if size is even,
* otherwise default to 8 (arbitrary value for now to speed things up). */
@ -474,10 +473,13 @@ bool input_overlay_load_overlays_iterate(input_overlay_t *ol)
{
size_t i = 0;
bool not_done = true;
struct overlay *overlay = NULL;
if (!ol)
return false;
overlay = &ol->overlays[ol->pos];
not_done = ol->pos < ol->size;
if (!not_done)
@ -498,67 +500,55 @@ bool input_overlay_load_overlays_iterate(input_overlay_t *ol)
ol->overlays[ol->pos].pos = 0;
break;
case OVERLAY_IMAGE_TRANSFER_DESC_IMAGE_ITERATE:
for (i = 0; i < overlay->pos_increment; i++)
{
struct overlay *overlay = &ol->overlays[ol->pos];
for (i = 0; i < overlay->pos_increment; i++)
if (overlay->pos < overlay->size)
{
unsigned idx = ol->pos;
if (overlay->pos < overlay->size)
if (!input_overlay_load_desc_image(ol, &overlay->descs[overlay->pos], overlay,
ol->pos, overlay->pos,
overlay->image.width, overlay->image.height,
overlay->config.normalized,
overlay->config.alpha_mod, overlay->config.range_mod))
{
if (!input_overlay_load_desc_image(ol, &overlay->descs[overlay->pos], overlay,
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 desc images for overlay #%u.\n",
(unsigned)overlay->pos);
goto error;
}
}
else
{
overlay->pos = 0;
ol->loading_status = OVERLAY_IMAGE_TRANSFER_DESC_ITERATE;
break;
RARCH_ERR("[Overlay]: Failed to load overlay desc images for overlay #%u.\n",
(unsigned)overlay->pos);
goto error;
}
}
else
{
overlay->pos = 0;
ol->loading_status = OVERLAY_IMAGE_TRANSFER_DESC_ITERATE;
break;
}
}
break;
case OVERLAY_IMAGE_TRANSFER_DESC_ITERATE:
for (i = 0; i < overlay->pos_increment; i++)
{
struct overlay *overlay = &ol->overlays[ol->pos];
for (i = 0; i < overlay->pos_increment; i++)
if (overlay->pos < overlay->size)
{
unsigned idx = ol->pos;
if (overlay->pos < overlay->size)
if (!input_overlay_load_desc(ol, &overlay->descs[overlay->pos], overlay,
ol->pos, overlay->pos,
overlay->image.width, overlay->image.height,
overlay->config.normalized,
overlay->config.alpha_mod, overlay->config.range_mod))
{
if (!input_overlay_load_desc(ol, &overlay->descs[overlay->pos], overlay,
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;
}
}
else
{
overlay->pos = 0;
ol->loading_status = OVERLAY_IMAGE_TRANSFER_DESC_DONE;
break;
RARCH_ERR("[Overlay]: Failed to load overlay descs for overlay #%u.\n",
(unsigned)overlay->pos);
goto error;
}
}
else
{
overlay->pos = 0;
ol->loading_status = OVERLAY_IMAGE_TRANSFER_DESC_DONE;
break;
}
}
break;
case OVERLAY_IMAGE_TRANSFER_DESC_DONE:
@ -572,6 +562,7 @@ bool input_overlay_load_overlays_iterate(input_overlay_t *ol)
}
return true;
error:
ol->state = OVERLAY_STATUS_DEFERRED_ERROR;