mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-15 09:40:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cut down on more HAVE_MENU ifdefs

Browse Source
This commit is contained in:
twinaphex 2017-12-31 18:02:14 +01:00
parent bd16fd49ab
commit 82d44e9ad3
11 changed files with 9 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/drivers/caca_gfx.c
View File

@ -320,11 +320,7 @@ static const video_poke_interface_t caca_poke_interface = {
NULL, NULL,
caca_set_texture_frame, caca_set_texture_frame,
NULL, NULL,
#if defined(HAVE_MENU)
caca_set_osd_msg, caca_set_osd_msg,
#else
NULL,
#endif
NULL, NULL,
NULL, NULL,

2
gfx/drivers/ctr_gfx.c
View File

@ -1135,9 +1135,7 @@ static const video_poke_interface_t ctr_poke_interface = {
ctr_apply_state_changes, ctr_apply_state_changes,
ctr_set_texture_frame, ctr_set_texture_frame,
ctr_set_texture_enable, ctr_set_texture_enable,
#ifdef HAVE_MENU
ctr_set_osd_msg, ctr_set_osd_msg,
#endif
NULL, NULL,
NULL, NULL,
NULL NULL

4
gfx/drivers/gdi_gfx.c
View File

@ -548,11 +548,7 @@ static const video_poke_interface_t gdi_poke_interface = {
NULL, NULL,
gdi_set_texture_frame, gdi_set_texture_frame,
NULL, NULL,
#if defined(HAVE_MENU)
gdi_set_osd_msg, gdi_set_osd_msg,
#else
NULL,
#endif
NULL, NULL,
NULL, NULL,

5
gfx/drivers/gl.c
View File

@ -845,7 +845,6 @@ static void gl_render_osd_background(
video_info->height, false, true); video_info->height, false, true);
} }
#if defined(HAVE_MENU)
static void gl_set_osd_msg(void *data, static void gl_set_osd_msg(void *data,
video_frame_info_t *video_info, video_frame_info_t *video_info,
const char *msg, const char *msg,
@ -854,6 +853,7 @@ static void gl_set_osd_msg(void *data,
font_driver_render_msg(video_info, font, msg, params); font_driver_render_msg(video_info, font, msg, params);
} }
#if defined(HAVE_MENU)
static void gl_show_mouse(void *data, bool state) static void gl_show_mouse(void *data, bool state)
{ {
video_context_driver_show_mouse(&state); video_context_driver_show_mouse(&state);
@ -2555,12 +2555,11 @@ static const video_poke_interface_t gl_poke_interface = {
gl_apply_state_changes, gl_apply_state_changes,
gl_set_texture_frame, gl_set_texture_frame,
gl_set_texture_enable, gl_set_texture_enable,
#if defined(HAVE_MENU)
gl_set_osd_msg, gl_set_osd_msg,
#if defined(HAVE_MENU)
gl_show_mouse, gl_show_mouse,
#else #else
NULL, NULL,
NULL,
#endif #endif
NULL, NULL,

6
gfx/drivers/sdl2_gfx.c
View File

@ -696,8 +696,6 @@ static void sdl2_poke_texture_enable(void *data,
vid->menu.active = enable; vid->menu.active = enable;
} }
#ifdef HAVE_MENU
static void sdl2_poke_set_osd_msg(void *data, static void sdl2_poke_set_osd_msg(void *data,
video_frame_info_t *video_info, video_frame_info_t *video_info,
const char *msg, const char *msg,
@ -708,6 +706,7 @@ static void sdl2_poke_set_osd_msg(void *data,
RARCH_LOG("[SDL2]: OSD MSG: %s\n", msg); RARCH_LOG("[SDL2]: OSD MSG: %s\n", msg);
} }
#ifdef HAVE_MENU
static void sdl2_show_mouse(void *data, bool state) static void sdl2_show_mouse(void *data, bool state)
{ {
(void)data; (void)data;
@ -737,14 +736,13 @@ static video_poke_interface_t sdl2_video_poke_interface = {
sdl2_poke_apply_state_changes, sdl2_poke_apply_state_changes,
sdl2_poke_set_texture_frame, sdl2_poke_set_texture_frame,
sdl2_poke_texture_enable, sdl2_poke_texture_enable,
#ifdef HAVE_MENU
sdl2_poke_set_osd_msg, sdl2_poke_set_osd_msg,
#ifdef HAVE_MENU
sdl2_show_mouse, sdl2_show_mouse,
sdl2_grab_mouse_toggle, sdl2_grab_mouse_toggle,
#else #else
NULL, NULL,
NULL, NULL,
NULL,
#endif #endif
NULL, NULL,
}; };

4
gfx/drivers/vga_gfx.c
View File

@ -407,11 +407,7 @@ static const video_poke_interface_t vga_poke_interface = {
NULL, NULL,
vga_set_texture_frame, vga_set_texture_frame,
NULL, NULL,
#if defined(HAVE_MENU)
vga_set_osd_msg, vga_set_osd_msg,
#else
NULL,
#endif
NULL, NULL,
NULL, NULL,

2
gfx/drivers/vita2d_gfx.c
View File

@ -794,9 +794,7 @@ static const video_poke_interface_t vita_poke_interface = {
vita_apply_state_changes, vita_apply_state_changes,
vita_set_texture_frame, vita_set_texture_frame,
vita_set_texture_enable, vita_set_texture_enable,
#ifdef HAVE_MENU
vita_set_osd_msg, vita_set_osd_msg,
#endif
NULL, NULL,
NULL, NULL,
NULL, NULL,

4
gfx/drivers/xshm_gfx.c
View File

@ -190,7 +190,6 @@ static void xshm_poke_set_osd_msg(void *data,
const char *msg, const char *msg,
const struct font_params *params, void *font) const struct font_params *params, void *font)
{ {
} }
static void xshm_show_mouse(void *data, bool state) static void xshm_show_mouse(void *data, bool state)
@ -220,14 +219,13 @@ static video_poke_interface_t xshm_video_poke_interface = {
xshm_poke_apply_state_changes, xshm_poke_apply_state_changes,
xshm_poke_set_texture_frame, xshm_poke_set_texture_frame,
xshm_poke_texture_enable, xshm_poke_texture_enable,
#ifdef HAVE_MENU
xshm_poke_set_osd_msg, xshm_poke_set_osd_msg,
#ifdef HAVE_MENU
xshm_show_mouse, xshm_show_mouse,
xshm_grab_mouse_toggle, xshm_grab_mouse_toggle,
#else #else
NULL, NULL,
NULL, NULL,
NULL,
#endif #endif
NULL, NULL,
}; };

4
gfx/video_driver.h
View File

@ -467,10 +467,6 @@ typedef struct video_frame_info
bool (*cb_set_resize)(void*, unsigned, unsigned); bool (*cb_set_resize)(void*, unsigned, unsigned);
void (*cb_shader_use)(void *data, void *shader_data, unsigned index, bool set_active); void (*cb_shader_use)(void *data, void *shader_data, unsigned index, bool set_active);
#if 0
bool (*cb_set_coords)(void *handle_data,
void *shader_data, const struct video_coords *coords);
#endif
bool (*cb_set_mvp)(void *data, void *shader_data, bool (*cb_set_mvp)(void *data, void *shader_data,
const void *mat_data); const void *mat_data);

6
gfx/video_thread_wrapper.c
View File

@ -1192,7 +1192,6 @@ static void thread_set_texture_enable(void *data, bool state, bool full_screen)
slock_unlock(thr->frame.lock); slock_unlock(thr->frame.lock);
} }
#if defined(HAVE_MENU)
static void thread_set_osd_msg(void *data, static void thread_set_osd_msg(void *data,
video_frame_info_t *video_info, video_frame_info_t *video_info,
const char *msg, const char *msg,
@ -1208,7 +1207,6 @@ static void thread_set_osd_msg(void *data,
if (thr->poke && thr->poke->set_osd_msg) if (thr->poke && thr->poke->set_osd_msg)
thr->poke->set_osd_msg(thr->driver_data, video_info, msg, params, font); thr->poke->set_osd_msg(thr->driver_data, video_info, msg, params, font);
} }
#endif
static uintptr_t thread_load_texture(void *video_data, void *data, static uintptr_t thread_load_texture(void *video_data, void *data,
bool threaded, enum texture_filter_type filter_type) bool threaded, enum texture_filter_type filter_type)
@ -1270,11 +1268,7 @@ static const video_poke_interface_t thread_poke = {
thread_apply_state_changes, thread_apply_state_changes,
thread_set_texture_frame, thread_set_texture_frame,
thread_set_texture_enable, thread_set_texture_enable,
#if defined(HAVE_MENU)
thread_set_osd_msg, thread_set_osd_msg,
#else
NULL,
#endif
NULL, NULL,
NULL, NULL,

5
retroarch.c
View File

@ -2364,7 +2364,9 @@ static enum runloop_state runloop_check_state(
unsigned *sleep_ms) unsigned *sleep_ms)
{ {
retro_bits_t current_input; retro_bits_t current_input;
#ifdef HAVE_MENU
static retro_bits_t last_input = {{0}}; static retro_bits_t last_input = {{0}};
#endif
static bool old_fs_toggle_pressed= false; static bool old_fs_toggle_pressed= false;
static bool old_focus = true; static bool old_focus = true;
bool is_focused = false; bool is_focused = false;
@ -2383,9 +2385,8 @@ static enum runloop_state runloop_check_state(
#endif #endif
input_keys_pressed(settings, &current_input); input_keys_pressed(settings, &current_input);
last_input = current_input;
#ifdef HAVE_MENU #ifdef HAVE_MENU
last_input = current_input;
if ( if (
((settings->uints.input_menu_toggle_gamepad_combo != INPUT_TOGGLE_NONE) && ((settings->uints.input_menu_toggle_gamepad_combo != INPUT_TOGGLE_NONE) &&
input_driver_toggle_button_combo( input_driver_toggle_button_combo(