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

Remove gfx_widgets_get_pure_white

Browse Source
This commit is contained in:
twinaphex 2020-08-31 23:46:24 +02:00
parent 2e49a3ae18
commit 521050cf79
5 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gfx/gfx_widgets.c
View File

@ -118,11 +118,6 @@ gfx_widget_font_data_t* gfx_widgets_get_font_msg_queue(void *data)
return &p_dispwidget->gfx_widget_fonts.msg_queue;
}
float* gfx_widgets_get_pure_white(void)
{
return gfx_widgets_pure_white;
}
float* gfx_widgets_get_backdrop_orig(void)
{
return gfx_widgets_backdrop_orig;

2
gfx/gfx_widgets.h
View File

@ -270,8 +270,6 @@ struct gfx_widget
uintptr_t gfx_widgets_get_generic_tag(void *data);
float* gfx_widgets_get_pure_white(void);
unsigned gfx_widgets_get_padding(void *data);
unsigned gfx_widgets_get_divider_width(void *data);

15
gfx/widgets/gfx_widget_achievement_popup.c
View File

@ -106,6 +106,12 @@ static void gfx_widget_achievement_popup_context_destroy(void)
static void gfx_widget_achievement_popup_frame(void* data, void* userdata)
{
static float pure_white[16] = {
1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00,
};
gfx_widget_achievement_popup_state_t* state = gfx_widget_achievement_popup_get_ptr();
/* if there's nothing in the queue, just bail */
@ -126,7 +132,7 @@ static void gfx_widget_achievement_popup_frame(void* data, void* userdata)
int scissor_me_timbers = 0;
gfx_display_set_alpha(gfx_widgets_get_backdrop_orig(), DEFAULT_BACKDROP);
gfx_display_set_alpha(gfx_widgets_get_pure_white(), 1.0f);
gfx_display_set_alpha(pure_white, 1.0f);
/* Default icon */
if (!state->queue[state->queue_read_index].badge)
@ -150,10 +156,11 @@ static void gfx_widget_achievement_popup_frame(void* data, void* userdata)
video_height,
state->height,
state->height,
p_dispwidget->gfx_widgets_icons_textures[MENU_WIDGETS_ICON_ACHIEVEMENT],
p_dispwidget->gfx_widgets_icons_textures[
MENU_WIDGETS_ICON_ACHIEVEMENT],
0,
state->y,
0, 1, gfx_widgets_get_pure_white());
0, 1, pure_white);
gfx_display_blend_end(video_info->userdata);
}
}
@ -171,7 +178,7 @@ static void gfx_widget_achievement_popup_frame(void* data, void* userdata)
state->y,
0,
1,
gfx_widgets_get_pure_white());
pure_white);
}
/* I _think_ state->unfold changes in another thread */

51
gfx/widgets/gfx_widget_screenshot.c
View File

@ -197,6 +197,12 @@ static void gfx_widget_screenshot_free(void)
static void gfx_widget_screenshot_frame(void* data, void *user_data)
{
static float pure_white[16] = {
1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00,
};
video_frame_info_t *video_info = (video_frame_info_t*)data;
void *userdata = video_info->userdata;
unsigned video_width = video_info->width;
@ -204,7 +210,6 @@ static void gfx_widget_screenshot_frame(void* data, void *user_data)
dispgfx_widget_t *p_dispwidget = (dispgfx_widget_t*)user_data;
gfx_widget_screenshot_state_t* state = gfx_widget_screenshot_get_ptr();
gfx_widget_font_data_t* font_regular = gfx_widgets_get_font_regular(p_dispwidget);
float* pure_white = gfx_widgets_get_pure_white();
int padding = (state->height - (font_regular->line_height * 2.0f)) / 2.0f;
/* Screenshot */
@ -216,24 +221,24 @@ static void gfx_widget_screenshot_frame(void* data, void *user_data)
gfx_display_set_alpha(gfx_widgets_get_backdrop_orig(), DEFAULT_BACKDROP);
gfx_display_draw_quad(userdata,
video_width, video_height,
0, state->y,
state->width, state->height,
video_width, video_height,
gfx_widgets_get_backdrop_orig()
);
video_width, video_height,
0, state->y,
state->width, state->height,
video_width, video_height,
gfx_widgets_get_backdrop_orig()
);
gfx_display_set_alpha(pure_white, 1.0f);
gfx_widgets_draw_icon(
userdata,
video_width,
video_height,
state->thumbnail_width,
state->thumbnail_height,
state->texture,
0, state->y,
0, 1, pure_white
);
userdata,
video_width,
video_height,
state->thumbnail_width,
state->thumbnail_height,
state->texture,
0, state->y,
0, 1, pure_white
);
gfx_widgets_draw_text(font_regular,
msg_hash_to_str(MSG_SCREENSHOT_SAVED),
@ -267,13 +272,13 @@ static void gfx_widget_screenshot_frame(void* data, void *user_data)
{
gfx_display_set_alpha(pure_white, state->alpha);
gfx_display_draw_quad(userdata,
video_width,
video_height,
0, 0,
video_width, video_height,
video_width, video_height,
pure_white
);
video_width,
video_height,
0, 0,
video_width, video_height,
video_width, video_height,
pure_white
);
}
}

7
gfx/widgets/gfx_widget_volume.c
View File

@ -93,6 +93,12 @@ gfx_widget_volume_state_t* gfx_widget_volume_get_ptr(void)
static void gfx_widget_volume_frame(void* data, void *user_data)
{
static float pure_white[16] = {
1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00,
};
gfx_widget_volume_state_t* state = gfx_widget_volume_get_ptr();
if (state->alpha > 0.0f)
@ -109,7 +115,6 @@ static void gfx_widget_volume_frame(void* data, void *user_data)
unsigned padding = gfx_widgets_get_padding(user_data);
float* backdrop_orig = gfx_widgets_get_backdrop_orig();
float* pure_white = gfx_widgets_get_pure_white();
uintptr_t volume_icon = 0;
unsigned icon_size = state->textures[ICON_MED] ? state->widget_height : padding;