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

(Menu) Get rid of HAVE_SHADER_MANAGER ifdefs

This commit is contained in:
twinaphex 2014-08-27 14:50:49 +02:00
parent c564252f2f
commit 575d11b358
2 changed files with 266 additions and 293 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
frontend/menu/backend/menu_common_backend.c
View File

@ -42,7 +42,6 @@
#endif #endif
#endif #endif
#ifdef HAVE_SHADER_MANAGER
static inline struct gfx_shader *shader_manager_get_current_shader(menu_handle_t *menu, unsigned type) static inline struct gfx_shader *shader_manager_get_current_shader(menu_handle_t *menu, unsigned type)
{ {
struct gfx_shader *shader = NULL; struct gfx_shader *shader = NULL;
@ -55,7 +54,6 @@ static inline struct gfx_shader *shader_manager_get_current_shader(menu_handle_t
return shader; return shader;
} }
#endif
static void menu_common_entries_init(menu_handle_t *menu, unsigned menu_type) static void menu_common_entries_init(menu_handle_t *menu, unsigned menu_type)
{ {
@ -68,7 +66,6 @@ static void menu_common_entries_init(menu_handle_t *menu, unsigned menu_type)
switch (menu_type) switch (menu_type)
{ {
#ifdef HAVE_SHADER_MANAGER
case MENU_SETTINGS_SHADER_PARAMETERS: case MENU_SETTINGS_SHADER_PARAMETERS:
case MENU_SETTINGS_SHADER_PRESET_PARAMETERS: case MENU_SETTINGS_SHADER_PRESET_PARAMETERS:
{ {
@ -121,7 +118,6 @@ static void menu_common_entries_init(menu_handle_t *menu, unsigned menu_type)
} }
} }
break; break;
#endif
case MENU_SETTINGS_GENERAL_OPTIONS: case MENU_SETTINGS_GENERAL_OPTIONS:
file_list_clear(menu->selection_buf); file_list_clear(menu->selection_buf);
file_list_push(menu->selection_buf, "", "libretro_log_level", MENU_SETTINGS_LIBRETRO_LOG_LEVEL, 0); file_list_push(menu->selection_buf, "", "libretro_log_level", MENU_SETTINGS_LIBRETRO_LOG_LEVEL, 0);
@ -398,9 +394,7 @@ static void menu_common_entries_init(menu_handle_t *menu, unsigned menu_type)
file_list_push(menu->selection_buf, "Input Driver", "", MENU_SETTINGS_DRIVER_INPUT, 0); file_list_push(menu->selection_buf, "Input Driver", "", MENU_SETTINGS_DRIVER_INPUT, 0);
file_list_push(menu->selection_buf, "Camera Driver", "", MENU_SETTINGS_DRIVER_CAMERA, 0); file_list_push(menu->selection_buf, "Camera Driver", "", MENU_SETTINGS_DRIVER_CAMERA, 0);
file_list_push(menu->selection_buf, "Location Driver", "", MENU_SETTINGS_DRIVER_LOCATION, 0); file_list_push(menu->selection_buf, "Location Driver", "", MENU_SETTINGS_DRIVER_LOCATION, 0);
#ifdef HAVE_MENU
file_list_push(menu->selection_buf, "Menu Driver", "", MENU_SETTINGS_DRIVER_MENU, 0); file_list_push(menu->selection_buf, "Menu Driver", "", MENU_SETTINGS_DRIVER_MENU, 0);
#endif
break; break;
case MENU_SETTINGS_PERFORMANCE_COUNTERS: case MENU_SETTINGS_PERFORMANCE_COUNTERS:
file_list_clear(menu->selection_buf); file_list_clear(menu->selection_buf);
@ -2049,7 +2043,6 @@ static int menu_action_ok(const char *dir, unsigned menu_type,
} }
else else
{ {
#ifdef HAVE_SHADER_MANAGER
if (menu_common_type_is(menu_type) == MENU_SETTINGS_SHADER_OPTIONS) if (menu_common_type_is(menu_type) == MENU_SETTINGS_SHADER_OPTIONS)
{ {
if (menu_type == MENU_SETTINGS_SHADER_PRESET) if (menu_type == MENU_SETTINGS_SHADER_PRESET)
@ -2075,9 +2068,7 @@ static int menu_action_ok(const char *dir, unsigned menu_type,
// Pop stack until we hit shader manager again. // Pop stack until we hit shader manager again.
menu_flush_stack_type(MENU_SETTINGS_SHADER_OPTIONS); menu_flush_stack_type(MENU_SETTINGS_SHADER_OPTIONS);
} }
else else if (menu_type == MENU_SETTINGS_DEFERRED_CORE)
#endif
if (menu_type == MENU_SETTINGS_DEFERRED_CORE)
{ {
strlcpy(g_settings.libretro, path, sizeof(g_settings.libretro)); strlcpy(g_settings.libretro, path, sizeof(g_settings.libretro));
strlcpy(g_extern.fullpath, driver.menu->deferred_path, sizeof(g_extern.fullpath)); strlcpy(g_extern.fullpath, driver.menu->deferred_path, sizeof(g_extern.fullpath));
@ -2441,7 +2432,6 @@ static int menu_common_iterate(unsigned action)
static void menu_common_shader_manager_init(menu_handle_t *menu) static void menu_common_shader_manager_init(menu_handle_t *menu)
{ {
#ifdef HAVE_SHADER_MANAGER
char cgp_path[PATH_MAX]; char cgp_path[PATH_MAX];
config_file_t *conf = NULL; config_file_t *conf = NULL;
const char *config_path = NULL; const char *config_path = NULL;
@ -2513,12 +2503,10 @@ static void menu_common_shader_manager_init(menu_handle_t *menu)
config_file_free(conf); config_file_free(conf);
} }
} }
#endif
} }
static void menu_common_shader_manager_set_preset(struct gfx_shader *shader, unsigned type, const char *cgp_path) static void menu_common_shader_manager_set_preset(struct gfx_shader *shader, unsigned type, const char *cgp_path)
{ {
#ifdef HAVE_SHADER_MANAGER
RARCH_LOG("Setting Menu shader: %s.\n", cgp_path ? cgp_path : "N/A (stock)"); RARCH_LOG("Setting Menu shader: %s.\n", cgp_path ? cgp_path : "N/A (stock)");
if (driver.video->set_shader && driver.video->set_shader(driver.video_data, (enum rarch_shader_type)type, cgp_path)) if (driver.video->set_shader && driver.video->set_shader(driver.video_data, (enum rarch_shader_type)type, cgp_path))
@ -2553,7 +2541,6 @@ static void menu_common_shader_manager_set_preset(struct gfx_shader *shader, uns
RARCH_ERR("Setting Menu CGP failed.\n"); RARCH_ERR("Setting Menu CGP failed.\n");
g_settings.video.shader_enable = false; g_settings.video.shader_enable = false;
} }
#endif
} }
static void menu_common_shader_manager_get_str(struct gfx_shader *shader, char *type_str, size_t type_str_size, unsigned type) static void menu_common_shader_manager_get_str(struct gfx_shader *shader, char *type_str, size_t type_str_size, unsigned type)
@ -2563,7 +2550,6 @@ static void menu_common_shader_manager_get_str(struct gfx_shader *shader, char *
(void)type_str_size; (void)type_str_size;
(void)type; (void)type;
#ifdef HAVE_SHADER_MANAGER
if (type == MENU_SETTINGS_SHADER_APPLY) if (type == MENU_SETTINGS_SHADER_APPLY)
*type_str = '\0'; *type_str = '\0';
else if (type >= MENU_SETTINGS_SHADER_PARAMETER_0 && type <= MENU_SETTINGS_SHADER_PARAMETER_LAST) else if (type >= MENU_SETTINGS_SHADER_PARAMETER_0 && type <= MENU_SETTINGS_SHADER_PARAMETER_LAST)
@ -2622,12 +2608,10 @@ static void menu_common_shader_manager_get_str(struct gfx_shader *shader, char *
} }
else else
*type_str = '\0'; *type_str = '\0';
#endif
} }
static void menu_common_shader_manager_save_preset(const char *basename, bool apply) static void menu_common_shader_manager_save_preset(const char *basename, bool apply)
{ {
#ifdef HAVE_SHADER_MANAGER
char buffer[PATH_MAX], config_directory[PATH_MAX], cgp_path[PATH_MAX]; char buffer[PATH_MAX], config_directory[PATH_MAX], cgp_path[PATH_MAX];
unsigned d, type = RARCH_SHADER_NONE; unsigned d, type = RARCH_SHADER_NONE;
config_file_t *conf; config_file_t *conf;
@ -2701,12 +2685,10 @@ static void menu_common_shader_manager_save_preset(const char *basename, bool ap
config_file_free(conf); config_file_free(conf);
if (!ret) if (!ret)
RARCH_ERR("Failed to save shader preset. Make sure config directory and/or shader dir are writable.\n"); RARCH_ERR("Failed to save shader preset. Make sure config directory and/or shader dir are writable.\n");
#endif
} }
static unsigned menu_common_shader_manager_get_type(const struct gfx_shader *shader) static unsigned menu_common_shader_manager_get_type(const struct gfx_shader *shader)
{ {
#ifdef HAVE_SHADER_MANAGER
// All shader types must be the same, or we cannot use it. // All shader types must be the same, or we cannot use it.
unsigned i; unsigned i;
unsigned type = RARCH_SHADER_NONE; unsigned type = RARCH_SHADER_NONE;
@ -2738,9 +2720,6 @@ static unsigned menu_common_shader_manager_get_type(const struct gfx_shader *sha
} }
return type; return type;
#else
return 0;
#endif
} }
@ -2753,7 +2732,6 @@ static int menu_common_shader_manager_setting_toggle(unsigned id,
return 0; return 0;
} }
#ifdef HAVE_SHADER_MANAGER
rarch_setting_t *current_setting; rarch_setting_t *current_setting;
rarch_setting_t *setting_data = (rarch_setting_t *)setting_data_get_list(); rarch_setting_t *setting_data = (rarch_setting_t *)setting_data_get_list();
@ -2890,7 +2868,6 @@ static int menu_common_shader_manager_setting_toggle(unsigned id,
break; break;
} }
} }
#endif
return 0; return 0;
} }
@ -2900,14 +2877,12 @@ static int menu_common_setting_toggle(unsigned id, unsigned action,
{ {
(void)menu_type; (void)menu_type;
#ifdef HAVE_SHADER_MANAGER
if ((id >= MENU_SETTINGS_SHADER_FILTER) && (id <= MENU_SETTINGS_SHADER_LAST)) if ((id >= MENU_SETTINGS_SHADER_FILTER) && (id <= MENU_SETTINGS_SHADER_LAST))
{ {
if (driver.menu_ctx && driver.menu_ctx->backend && driver.menu_ctx->backend->shader_manager_setting_toggle) if (driver.menu_ctx && driver.menu_ctx->backend && driver.menu_ctx->backend->shader_manager_setting_toggle)
return driver.menu_ctx->backend->shader_manager_setting_toggle(id, action, setting); return driver.menu_ctx->backend->shader_manager_setting_toggle(id, action, setting);
return 0; return 0;
} }
#endif
if ((id >= MENU_SETTINGS_CORE_OPTION_START) && if ((id >= MENU_SETTINGS_CORE_OPTION_START) &&
(driver.menu_ctx && driver.menu_ctx->backend && driver.menu_ctx->backend->core_setting_toggle) (driver.menu_ctx && driver.menu_ctx->backend && driver.menu_ctx->backend->core_setting_toggle)
) )
@ -3521,7 +3496,6 @@ static int menu_common_setting_set(unsigned id, unsigned action, rarch_setting_t
#endif #endif
break; break;
#ifdef HAVE_SHADER_MANAGER
case MENU_SETTINGS_SHADER_PASSES: case MENU_SETTINGS_SHADER_PASSES:
{ {
struct gfx_shader *shader = (struct gfx_shader*)driver.menu->shader; struct gfx_shader *shader = (struct gfx_shader*)driver.menu->shader;
@ -3592,7 +3566,6 @@ static int menu_common_setting_set(unsigned id, unsigned action, rarch_setting_t
if (action == MENU_ACTION_OK) if (action == MENU_ACTION_OK)
menu_key_start_line(driver.menu, "Preset Filename: ", "shader_preset_save", preset_filename_callback); menu_key_start_line(driver.menu, "Preset Filename: ", "shader_preset_save", preset_filename_callback);
break; break;
#endif
#ifdef _XBOX1 #ifdef _XBOX1
case MENU_SETTINGS_SOFT_DISPLAY_FILTER: case MENU_SETTINGS_SOFT_DISPLAY_FILTER:
switch (action) switch (action)
@ -3895,9 +3868,7 @@ static void menu_common_setting_set_label(char *type_str,
case MENU_SETTINGS_CUSTOM_VIEWPORT: case MENU_SETTINGS_CUSTOM_VIEWPORT:
case MENU_SETTINGS_TOGGLE_FULLSCREEN: case MENU_SETTINGS_TOGGLE_FULLSCREEN:
case MENU_SETTINGS_DISK_OPTIONS: case MENU_SETTINGS_DISK_OPTIONS:
#ifdef HAVE_SHADER_MANAGER
case MENU_SETTINGS_SHADER_PRESET: case MENU_SETTINGS_SHADER_PRESET:
#endif
case MENU_SETTINGS_SHADER_PRESET_SAVE: case MENU_SETTINGS_SHADER_PRESET_SAVE:
case MENU_SETTINGS_CORE: case MENU_SETTINGS_CORE:
case MENU_SETTINGS_DISK_APPEND: case MENU_SETTINGS_DISK_APPEND:

10
settings_data.c
View File

@ -1216,6 +1216,8 @@ static void general_read_handler(const void *data)
*setting->value.unsigned_integer = g_extern.netplay_sync_frames; *setting->value.unsigned_integer = g_extern.netplay_sync_frames;
else if (!strcmp(setting->name, "netplay_tcp_udp_port")) else if (!strcmp(setting->name, "netplay_tcp_udp_port"))
*setting->value.unsigned_integer = g_extern.netplay_port; *setting->value.unsigned_integer = g_extern.netplay_port;
else if (!strcmp(setting->name, "netplay_ip_address"))
strlcpy(setting->value.string, g_extern.netplay_server, setting->size);
#endif #endif
else if (!strcmp(setting->name, "log_verbosity")) else if (!strcmp(setting->name, "log_verbosity"))
*setting->value.boolean = g_extern.verbosity; *setting->value.boolean = g_extern.verbosity;
@ -1233,8 +1235,6 @@ static void general_read_handler(const void *data)
*setting->value.unsigned_integer = g_settings.user_language; *setting->value.unsigned_integer = g_settings.user_language;
else if (!strcmp(setting->name, "netplay_nickname")) else if (!strcmp(setting->name, "netplay_nickname"))
strlcpy(setting->value.string, g_settings.username, setting->size); strlcpy(setting->value.string, g_settings.username, setting->size);
else if (!strcmp(setting->name, "netplay_ip_address"))
strlcpy(setting->value.string, g_extern.netplay_server, setting->size);
} }
static void general_write_handler(const void *data) static void general_write_handler(const void *data)
@ -1524,8 +1524,6 @@ static void general_write_handler(const void *data)
strlcpy(g_settings.video.filter_dir, setting->value.string, sizeof(g_settings.video.filter_dir)); strlcpy(g_settings.video.filter_dir, setting->value.string, sizeof(g_settings.video.filter_dir));
else if (!strcmp(setting->name, "netplay_nickname")) else if (!strcmp(setting->name, "netplay_nickname"))
strlcpy(g_settings.username, setting->value.string, sizeof(g_settings.username)); strlcpy(g_settings.username, setting->value.string, sizeof(g_settings.username));
else if (!strcmp(setting->name, "netplay_ip_address"))
strlcpy(g_extern.netplay_server, setting->value.string, sizeof(g_extern.netplay_server));
else if (!strcmp(setting->name, "audio_filter_dir")) else if (!strcmp(setting->name, "audio_filter_dir"))
strlcpy(g_settings.audio.filter_dir, setting->value.string, sizeof(g_settings.audio.filter_dir)); strlcpy(g_settings.audio.filter_dir, setting->value.string, sizeof(g_settings.audio.filter_dir));
else if (!strcmp(setting->name, "video_shader_dir")) else if (!strcmp(setting->name, "video_shader_dir"))
@ -1546,6 +1544,8 @@ static void general_write_handler(const void *data)
else if (!strcmp(setting->name, "video_shared_context")) else if (!strcmp(setting->name, "video_shared_context"))
g_settings.video.shared_context = *setting->value.boolean; g_settings.video.shared_context = *setting->value.boolean;
#ifdef HAVE_NETPLAY #ifdef HAVE_NETPLAY
else if (!strcmp(setting->name, "netplay_ip_address"))
strlcpy(g_extern.netplay_server, setting->value.string, sizeof(g_extern.netplay_server));
else if (!strcmp(setting->name, "netplay_enable")) else if (!strcmp(setting->name, "netplay_enable"))
g_extern.netplay_enable = *setting->value.boolean; g_extern.netplay_enable = *setting->value.boolean;
else if (!strcmp(setting->name, "netplay_mode")) else if (!strcmp(setting->name, "netplay_mode"))
@ -1884,7 +1884,9 @@ rarch_setting_t* setting_data_get_list(void)
START_GROUP("Netplay Options") START_GROUP("Netplay Options")
START_SUB_GROUP("State") START_SUB_GROUP("State")
CONFIG_BOOL(g_extern.netplay_enable, "netplay_enable", "Netplay Enable", false, GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) CONFIG_BOOL(g_extern.netplay_enable, "netplay_enable", "Netplay Enable", false, GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler)
#ifdef HAVE_NETPLAY
CONFIG_STRING(g_extern.netplay_server, "netplay_ip_address", "IP Address", "", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) CONFIG_STRING(g_extern.netplay_server, "netplay_ip_address", "IP Address", "", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler)
#endif
CONFIG_BOOL(g_extern.netplay_is_client, "netplay_mode", "Netplay Client Enable", false, GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) CONFIG_BOOL(g_extern.netplay_is_client, "netplay_mode", "Netplay Client Enable", false, GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler)
CONFIG_BOOL(g_extern.netplay_is_spectate, "netplay_spectator_mode_enable", "Netplay Spectator Enable", false, GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) CONFIG_BOOL(g_extern.netplay_is_spectate, "netplay_spectator_mode_enable", "Netplay Spectator Enable", false, GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler)
CONFIG_UINT(g_extern.netplay_sync_frames, "netplay_delay_frames", "Netplay Delay Frames", 0, GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) WITH_RANGE(0, 10, 1, true, false) CONFIG_UINT(g_extern.netplay_sync_frames, "netplay_delay_frames", "Netplay Delay Frames", 0, GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) WITH_RANGE(0, 10, 1, true, false)