mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-03 08:54:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1784 from heuripedes/master

Browse Source 
Fix XMB performance regression
This commit is contained in:
Twinaphex 2015-06-13 05:17:16 +02:00
commit ca7982e739
3 changed files with 97 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
menu/drivers/xmb.c
View File

@ -999,8 +999,12 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl,
xmb_node_t *core_node = NULL;
size_t end = 0;
uint64_t frame_count = video_driver_get_frame_count();
char name[PATH_MAX_LENGTH] = {0};
char value[PATH_MAX_LENGTH] = {0};
menu_entry_t entry = {{0}};
menu_handle_t *menu = menu_driver_get_ptr();
if (!list || !list->size)
if (!list || !list->size || !menu)
return;
video_driver_get_size(&width, &height);
@ -1021,17 +1025,18 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl,
for (i = 0; i < end; i++)
{
float icon_x, icon_y;
char name[PATH_MAX_LENGTH] = {0};
char value[PATH_MAX_LENGTH] = {0};
menu_entry_t entry = {{0}};
GLuint texture_switch = 0;
GLuint icon = 0;
xmb_node_t * node = (xmb_node_t*)menu_list_get_userdata_at_offset(list, i);
menu_handle_t *menu = menu_driver_get_ptr();
uint32_t hash_label = 0;
uint32_t hash_value = 0;
bool do_draw_text = false;
*name = *value = 0;
*entry.path = *entry.label = *entry.value = 0;
entry.idx = entry.spacing = entry.type = 0;
if (!node)
continue;

115
menu/menu_animation.c
View File

@ -252,47 +252,53 @@ static float easing_out_in_bounce(float t, float b, float c, float d)
void menu_animation_free(animation_t *animation)
{
size_t i;
struct tween *t, *tnext;
if (!animation)
return;
for (i = 0; i < animation->size; i++)
for (t = animation->alive; t; t = tnext)
{
if (animation->list[i].subject)
animation->list[i].subject = NULL;
tnext = t->next;
free(t);
}
free(animation->list);
for (t = animation->dead; t; t = tnext)
{
tnext = t->next;
free(t);
}
animation->alive = NULL;
animation->dead = NULL;
animation->allocated = 0;
free(animation);
}
static struct tween *menu_animation_get_free_slot(animation_t *animation)
static struct tween *menu_animation_get_slot(animation_t *animation)
{
struct tween *slot = NULL;
if (!animation->dead)
{
size_t count = ((animation->allocated + 1) * 2) - animation->allocated;
unsigned i;
for (i = 0; i < animation->size; ++i)
for (i = 0; i < count; ++i)
{
if (!animation->list[i].alive)
{
slot = &animation->list[i];
memset(slot, 0, sizeof(*slot));
break;
}
slot = calloc(1, sizeof(struct tween));
slot->next = animation->dead;
animation->dead = slot;
}
if (!slot)
{
if (animation->size >= animation->capacity)
{
animation->capacity++;
animation->list = (struct tween*)realloc(animation->list,
animation->capacity * sizeof(struct tween));
animation->allocated += count;
}
slot = &animation->list[animation->size++];
}
slot = animation->dead;
animation->dead = slot->next;
slot->next = animation->alive;
animation->alive = slot;
return slot;
}
@ -302,16 +308,30 @@ void menu_animation_kill_by_subject(animation_t *animation, size_t count, const
unsigned i, j;
float **sub = (float**)subjects;
for (i = 0; i < animation->size; ++i)
struct tween *t, *tnext, *tprev = NULL;
for (t = animation->alive; t; t = tnext)
{
bool killed = false;
tnext = t->next;
for (j = 0; j < count; ++j)
{
if (animation->list[i].subject == sub[j])
if (t->subject == sub[j])
{
animation->list[i].alive = 0;
animation->list[i].subject = NULL;
if (tprev)
tprev->next = tnext;
else
animation->alive = tnext;
tnext = t->next;
t->next = animation->dead;
animation->dead = t;
killed = true;
}
}
if (!killed)
tprev = t;
}
}
@ -319,9 +339,8 @@ bool menu_animation_push(animation_t *animation,
float duration, float target_value, float* subject,
enum animation_easing_type easing_enum, tween_cb cb)
{
struct tween *slot = menu_animation_get_free_slot(animation);
struct tween *slot = menu_animation_get_slot(animation);
slot->alive = 1;
slot->duration = duration;
slot->running_since = 0;
slot->initial_value = *subject;
@ -447,14 +466,13 @@ bool menu_animation_push(animation_t *animation,
}
static int menu_animation_iterate(struct tween *tween, float dt,
unsigned *active_tweens)
unsigned *active_tweens, bool *dead)
{
if (!tween)
return -1;
if (tween->running_since >= tween->duration || !tween->alive)
if (tween->running_since >= tween->duration)
{
tween->alive = 0;
tween->subject = NULL;
*dead = true;
return -1;
}
@ -467,9 +485,11 @@ static int menu_animation_iterate(struct tween *tween, float dt,
tween->target_value - tween->initial_value,
tween->duration);
*dead = false;
if (tween->running_since >= tween->duration)
{
*tween->subject = tween->target_value;
*dead = true;
if (tween->cb)
tween->cb();
@ -487,14 +507,35 @@ bool menu_animation_update(animation_t *animation, float dt)
unsigned active_tweens = 0;
menu_handle_t *menu = menu_driver_get_ptr();
for(i = 0; i < animation->size; i++)
menu_animation_iterate(&animation->list[i], dt, &active_tweens);
struct tween *t, *tnext, *tprev = NULL;
if (!active_tweens)
unsigned active = 0;
for (t = animation->alive; t; t = tnext)
{
animation->size = 0;
return false;
bool dead = false;
tnext = t->next;
menu_animation_iterate(t, dt, &active_tweens, &dead);
if (dead)
{
if (tprev)
tprev->next = tnext;
else
animation->alive = tnext;
t->next = animation->dead;
animation->dead = t;
}
else
{
tprev = t;
active++;
}
}
if (!animation->alive)
return false;
menu->animation_is_active = true;

9
menu/menu_animation.h
View File

@ -30,7 +30,8 @@ typedef void (*tween_cb) (void);
struct tween
{
int alive;
struct tween *next;
float duration;
float running_since;
float initial_value;
@ -42,10 +43,10 @@ struct tween
typedef struct animation
{
struct tween *list;
struct tween *alive;
struct tween *dead;
size_t capacity;
size_t size;
size_t allocated;
} animation_t;
enum animation_easing_type