From ef91d9a5289dc17bf9ab8b6d153c4ef490c8260b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 23 Feb 2015 22:11:18 +0100 Subject: [PATCH] Make function static --- input/input_overlay.c | 72 ++++++++++++++++++++++--------------------- input/input_overlay.h | 2 -- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/input/input_overlay.c b/input/input_overlay.c index 1aa206d35a..a508fe0ae2 100644 --- a/input/input_overlay.c +++ b/input/input_overlay.c @@ -471,7 +471,7 @@ 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). */ - overlay->pos_increment = (overlay->size / 2) ? (overlay->size / 2) : 8; + overlay->pos_increment = (overlay->size / 2) ? (overlay->size / 2) : 1; #if 0 RARCH_LOG("pos increment: %u\n", overlay->pos_increment); @@ -480,6 +480,40 @@ static bool input_overlay_load_overlay_image_done(struct overlay *overlay) return true; } +static void input_overlay_load_active(input_overlay_t *ol, + float opacity) +{ + if (!ol) + return; + + ol->iface->load(ol->iface_data, ol->active->load_images, + ol->active->load_images_size); + + input_overlay_set_alpha_mod(ol, opacity); + input_overlay_set_vertex_geom(ol); + ol->iface->full_screen(ol->iface_data, ol->active->full_screen); +} + +static bool input_overlay_render_active(input_overlay_t *ol) +{ + if (!ol) + return false; + + ol->active = &ol->overlays[0]; + + input_overlay_load_active(ol, ol->deferred.opacity); + input_overlay_enable(ol, ol->deferred.enable); + + input_overlay_set_alpha_mod(ol, ol->deferred.opacity); + input_overlay_set_scale_factor(ol, ol->deferred.scale_factor); + ol->next_index = (ol->index + 1) % ol->size; + + ol->state = OVERLAY_STATUS_ALIVE; + + + return true; +} + bool input_overlay_load_overlays_iterate(input_overlay_t *ol) { bool not_done = true; @@ -528,8 +562,8 @@ bool input_overlay_load_overlays_iterate(input_overlay_t *ol) } if (ol->pos == 0) { - /* First active overlay, load already. */ - input_overlay_new_done(driver.overlay); + /* First active overlay, load and render already. */ + input_overlay_render_active(driver.overlay); } ol->pos += 1; break; @@ -694,39 +728,7 @@ error: return false; } -static void input_overlay_load_active(input_overlay_t *ol, - float opacity) -{ - if (!ol) - return; - ol->iface->load(ol->iface_data, ol->active->load_images, - ol->active->load_images_size); - - input_overlay_set_alpha_mod(ol, opacity); - input_overlay_set_vertex_geom(ol); - ol->iface->full_screen(ol->iface_data, ol->active->full_screen); -} - -bool input_overlay_new_done(input_overlay_t *ol) -{ - if (!ol) - return false; - - ol->active = &ol->overlays[0]; - - input_overlay_load_active(ol, ol->deferred.opacity); - input_overlay_enable(ol, ol->deferred.enable); - - input_overlay_set_alpha_mod(ol, ol->deferred.opacity); - input_overlay_set_scale_factor(ol, ol->deferred.scale_factor); - ol->next_index = (ol->index + 1) % ol->size; - - ol->state = OVERLAY_STATUS_ALIVE; - - - return true; -} /** * input_overlay_new: diff --git a/input/input_overlay.h b/input/input_overlay.h index b7a1ee6ccd..952267ec90 100644 --- a/input/input_overlay.h +++ b/input/input_overlay.h @@ -237,8 +237,6 @@ bool input_overlay_load_overlays_image_iterate(input_overlay_t *ol); bool input_overlay_load_overlays_iterate(input_overlay_t *ol); -bool input_overlay_new_done(input_overlay_t *ol); - /** * input_overlay_free: * @ol : Overlay handle.