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

Cleanups

This commit is contained in:
twinaphex 2016-10-19 03:55:57 +02:00
parent 546a6aa64a
commit 0f3081701b
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
menu/drivers_display/menu_display_gl.c
View File

@ -158,13 +158,8 @@ static void menu_display_gl_draw(void *data)
static void menu_display_gl_draw_pipeline(void *data) static void menu_display_gl_draw_pipeline(void *data)
{ {
#ifdef HAVE_SHADERPIPELINE #ifdef HAVE_SHADERPIPELINE
video_shader_ctx_info_t shader_info;
menu_display_ctx_draw_t *draw = (menu_display_ctx_draw_t*)data; menu_display_ctx_draw_t *draw = (menu_display_ctx_draw_t*)data;
struct uniform_info uniform_param = {0}; video_coord_array_t *ca = menu_display_get_coords_array();
static float t = 0;
video_coord_array_t *ca = NULL;
ca = menu_display_get_coords_array();
draw->x = 0; draw->x = 0;
draw->y = 0; draw->y = 0;
@ -175,6 +170,11 @@ static void menu_display_gl_draw_pipeline(void *data)
{ {
case VIDEO_SHADER_MENU: case VIDEO_SHADER_MENU:
case VIDEO_SHADER_MENU_SEC: case VIDEO_SHADER_MENU_SEC:
{
static float t = 0;
video_shader_ctx_info_t shader_info;
struct uniform_info uniform_param = {0};
shader_info.data = NULL; shader_info.data = NULL;
shader_info.idx = draw->pipeline.id; shader_info.idx = draw->pipeline.id;
shader_info.set_active = true; shader_info.set_active = true;
@ -193,6 +193,7 @@ static void menu_display_gl_draw_pipeline(void *data)
uniform_param.result.f.v0 = t; uniform_param.result.f.v0 = t;
video_shader_driver_set_parameter(&uniform_param); video_shader_driver_set_parameter(&uniform_param);
}
break; break;
} }
#endif #endif

4
menu/menu_display.c
View File

@ -193,7 +193,9 @@ void menu_display_font_free(font_data_t *font)
font_data_t *menu_display_font(enum application_special_type type, float font_size) font_data_t *menu_display_font(enum application_special_type type, float font_size)
{ {
menu_display_ctx_font_t font_info; menu_display_ctx_font_t font_info;
char fontpath[PATH_MAX_LENGTH] = {0}; char fontpath[PATH_MAX_LENGTH];
fontpath[0] = '\0';
fill_pathname_application_special(fontpath, sizeof(fontpath), type); fill_pathname_application_special(fontpath, sizeof(fontpath), type);