mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2020-10-05 22:01:31 +02:00
parent d66541ba99
commit 18d21d8f95
4 changed files with 20 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gfx/widgets/gfx_widget_achievement_popup.c
View File

@ -120,13 +120,12 @@ static void gfx_widget_achievement_popup_frame(void* data, void* userdata)
if (state->queue[state->queue_read_index].title)
{
const video_frame_info_t* video_info = (const video_frame_info_t*)data;
const unsigned video_width = video_info->width;
const unsigned video_height = video_info->height;
dispgfx_widget_t* p_dispwidget = (dispgfx_widget_t*)userdata;
const unsigned unfold_offet = ((1.0f - state->unfold) * state->width / 2);
int scissor_me_timbers = 0;
const unsigned video_width = video_info->width;
const unsigned video_height = video_info->height;
dispgfx_widget_t* p_dispwidget = (dispgfx_widget_t*)userdata;
const unsigned unfold_offet = ((1.0f - state->unfold) *
state->width / 2);
int scissor_me_timbers = 0;
gfx_display_set_alpha(p_dispwidget->backdrop_orig, DEFAULT_BACKDROP);
gfx_display_set_alpha(pure_white, 1.0f);
@ -244,7 +243,8 @@ static void gfx_widget_achievement_popup_frame(void* data, void* userdata)
SLOCK_UNLOCK(state->queue_lock);
}
static void gfx_widget_achievement_popup_free_current(gfx_widget_achievement_popup_state_t* state)
static void gfx_widget_achievement_popup_free_current(
gfx_widget_achievement_popup_state_t* state)
{
if (state->queue[state->queue_read_index].title)
{

15
gfx/widgets/gfx_widget_generic_message.c
View File

@ -97,16 +97,11 @@ static gfx_widget_generic_message_state_t p_w_generic_message_st = {
false /* message_updated */
};
static gfx_widget_generic_message_state_t* gfx_widget_generic_message_get_state(void)
{
return &p_w_generic_message_st;
}
/* Utilities */
static void gfx_widget_generic_message_reset(bool cancel_pending)
{
gfx_widget_generic_message_state_t *state = gfx_widget_generic_message_get_state();
gfx_widget_generic_message_state_t *state = &p_w_generic_message_st;
uintptr_t alpha_tag = (uintptr_t)&state->alpha;
/* Kill any existing timers/animations */
@ -167,7 +162,7 @@ void gfx_widget_set_generic_message(void *data,
const char *msg, unsigned duration)
{
dispgfx_widget_t *p_dispwidget = (dispgfx_widget_t*)data;
gfx_widget_generic_message_state_t *state = gfx_widget_generic_message_get_state();
gfx_widget_generic_message_state_t *state = &p_w_generic_message_st;
unsigned last_video_width = p_dispwidget->last_video_width;
int text_width = 0;
gfx_widget_font_data_t *font_msg_queue = &p_dispwidget->gfx_widget_fonts.msg_queue;
@ -235,7 +230,7 @@ static void gfx_widget_generic_message_layout(
bool is_threaded, const char *dir_assets, char *font_path)
{
dispgfx_widget_t *p_dispwidget = (dispgfx_widget_t*)data;
gfx_widget_generic_message_state_t *state = gfx_widget_generic_message_get_state();
gfx_widget_generic_message_state_t *state = &p_w_generic_message_st;
unsigned last_video_width = p_dispwidget->last_video_width;
unsigned last_video_height = p_dispwidget->last_video_height;
@ -317,7 +312,7 @@ static void gfx_widget_generic_message_iterate(void *user_data,
const char *dir_assets, char *font_path,
bool is_threaded)
{
gfx_widget_generic_message_state_t *state = gfx_widget_generic_message_get_state();
gfx_widget_generic_message_state_t *state = &p_w_generic_message_st;
if (state->message_updated)
{
@ -405,7 +400,7 @@ static void gfx_widget_generic_message_iterate(void *user_data,
static void gfx_widget_generic_message_frame(void *data, void *user_data)
{
gfx_widget_generic_message_state_t *state = gfx_widget_generic_message_get_state();
gfx_widget_generic_message_state_t *state = &p_w_generic_message_st;
if (state->status != GFX_WIDGET_GENERIC_MESSAGE_IDLE)
{

11
gfx/widgets/gfx_widget_leaderboard_display.c
View File

@ -59,17 +59,11 @@ static bool gfx_widget_leaderboard_display_init(bool video_is_threaded, bool ful
return true;
}
static void gfx_widget_leaderboard_display_free_all(gfx_widget_leaderboard_display_state_t* state)
{
state->count = 0;
}
static void gfx_widget_leaderboard_display_free(void)
{
gfx_widget_leaderboard_display_state_t *state = &p_w_leaderboard_display_st;
gfx_widget_leaderboard_display_free_all(state);
state->count = 0;
#ifdef HAVE_THREADS
slock_free(state->array_lock);
state->array_lock = NULL;
@ -79,8 +73,7 @@ static void gfx_widget_leaderboard_display_free(void)
static void gfx_widget_leaderboard_display_context_destroy(void)
{
gfx_widget_leaderboard_display_state_t *state = &p_w_leaderboard_display_st;
gfx_widget_leaderboard_display_free_all(state);
state->count = 0;
}
static void gfx_widget_leaderboard_display_frame(void* data, void* userdata)

15
gfx/widgets/gfx_widget_libretro_message.c
View File

@ -91,16 +91,11 @@ static gfx_widget_libretro_message_state_t p_w_libretro_message_st = {
false /* message_updated */
};
static gfx_widget_libretro_message_state_t* gfx_widget_libretro_message_get_state(void)
{
return &p_w_libretro_message_st;
}
/* Utilities */
static void gfx_widget_libretro_message_reset(bool cancel_pending)
{
gfx_widget_libretro_message_state_t *state = gfx_widget_libretro_message_get_state();
gfx_widget_libretro_message_state_t *state = &p_w_libretro_message_st;
uintptr_t alpha_tag = (uintptr_t)&state->alpha;
/* Kill any existing timers/animations */
@ -161,7 +156,7 @@ void gfx_widget_set_libretro_message(void *data,
const char *msg, unsigned duration)
{
dispgfx_widget_t *p_dispwidget = (dispgfx_widget_t*)data;
gfx_widget_libretro_message_state_t *state = gfx_widget_libretro_message_get_state();
gfx_widget_libretro_message_state_t *state = &p_w_libretro_message_st;
gfx_widget_font_data_t *font_msg_queue = &p_dispwidget->gfx_widget_fonts.msg_queue;
/* Ensure we have a valid message string */
@ -214,7 +209,7 @@ static void gfx_widget_libretro_message_layout(
bool is_threaded, const char *dir_assets, char *font_path)
{
dispgfx_widget_t *p_dispwidget = (dispgfx_widget_t*)data;
gfx_widget_libretro_message_state_t *state = gfx_widget_libretro_message_get_state();
gfx_widget_libretro_message_state_t *state = &p_w_libretro_message_st;
unsigned last_video_height = p_dispwidget->last_video_height;
unsigned divider_width = p_dispwidget->divider_width_1px;
@ -250,7 +245,7 @@ static void gfx_widget_libretro_message_iterate(void *user_data,
const char *dir_assets, char *font_path,
bool is_threaded)
{
gfx_widget_libretro_message_state_t *state = gfx_widget_libretro_message_get_state();
gfx_widget_libretro_message_state_t *state = &p_w_libretro_message_st;
if (state->message_updated)
{
@ -338,7 +333,7 @@ static void gfx_widget_libretro_message_iterate(void *user_data,
static void gfx_widget_libretro_message_frame(void *data, void *user_data)
{
gfx_widget_libretro_message_state_t *state = gfx_widget_libretro_message_get_state();
gfx_widget_libretro_message_state_t *state = &p_w_libretro_message_st;
if (state->status != GFX_WIDGET_LIBRETRO_MESSAGE_IDLE)
{