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-11-20 14:42:20 +01:00
parent f9786d6c6a
commit e9daa5e99c
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
menu/menu_display.c
View File

@ -45,12 +45,25 @@
#include "menu_animation.h" #include "menu_animation.h"
#include "menu_display.h" #include "menu_display.h"
#define PARTICLES_COUNT 100
uintptr_t menu_display_white_texture; uintptr_t menu_display_white_texture;
static enum menu_toggle_reason menu_display_toggle_reason = MENU_TOGGLE_REASON_NONE; static enum menu_toggle_reason menu_display_toggle_reason = MENU_TOGGLE_REASON_NONE;
static video_coord_array_t menu_disp_ca;
static unsigned menu_display_framebuf_width = 0;
static unsigned menu_display_framebuf_height = 0;
static size_t menu_display_framebuf_pitch = 0;
static unsigned menu_display_header_height = 0;
static bool menu_display_msg_force = false;
static bool menu_display_font_alloc_framebuf = false;
static bool menu_display_framebuf_dirty = false;
static const uint8_t *menu_display_font_framebuf = NULL;
static msg_queue_t *menu_display_msg_queue = NULL;
static menu_display_ctx_driver_t *menu_disp = NULL;
static menu_display_ctx_driver_t *menu_display_ctx_drivers[] = { static menu_display_ctx_driver_t *menu_display_ctx_drivers[] = {
#ifdef HAVE_D3D #ifdef HAVE_D3D
&menu_display_ctx_d3d, &menu_display_ctx_d3d,
@ -161,18 +174,6 @@ void menu_display_timedate(menu_display_ctx_datetime_t *datetime)
} }
} }
static video_coord_array_t menu_disp_ca;
static unsigned menu_display_framebuf_width = 0;
static unsigned menu_display_framebuf_height = 0;
static size_t menu_display_framebuf_pitch = 0;
static unsigned menu_display_header_height = 0;
static bool menu_display_msg_force = false;
static bool menu_display_font_alloc_framebuf = false;
static bool menu_display_framebuf_dirty = false;
static const uint8_t *menu_display_font_framebuf = NULL;
static msg_queue_t *menu_display_msg_queue = NULL;
static menu_display_ctx_driver_t *menu_disp = NULL;
void menu_display_blend_begin(void) void menu_display_blend_begin(void)
{ {
if (!menu_disp || !menu_disp->blend_begin) if (!menu_disp || !menu_disp->blend_begin)
@ -779,8 +780,6 @@ void menu_display_push_quad(
video_coord_array_append(ca, &coords, 3); video_coord_array_append(ca, &coords, 3);
} }
#define PARTICLES_COUNT 100
void menu_display_snow(int width, int height) void menu_display_snow(int width, int height)
{ {
struct display_particle struct display_particle

2
menu/menu_driver.c
View File

@ -90,7 +90,7 @@ static menu_handle_t *menu_driver_data = NULL;
static const menu_ctx_driver_t *menu_driver_ctx = NULL; static const menu_ctx_driver_t *menu_driver_ctx = NULL;
static void *menu_userdata = NULL; static void *menu_userdata = NULL;
bool menu_driver_is_binding_state() bool menu_driver_is_binding_state(void)
{ {
return menu_driver_is_binding; return menu_driver_is_binding;
} }

3
menu/menu_driver.h
View File

@ -382,7 +382,8 @@ const char *menu_driver_ident(void);
bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data); bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data);
bool menu_driver_is_binding_state(); bool menu_driver_is_binding_state(void);
void menu_driver_set_binding_state(bool on); void menu_driver_set_binding_state(bool on);
extern menu_ctx_driver_t menu_ctx_xui; extern menu_ctx_driver_t menu_ctx_xui;