From cc059814556422e000dee1c777c59417d4eb1db8 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 6 Apr 2013 21:53:03 +0200 Subject: [PATCH] (PS3/360) Now uses embedded shaders instead of stock shader from common-shaders --- console/rarch_console.h | 1 - frontend/menu/rmenu.c | 2 +- frontend/platform/platform_ps3.c | 1 - frontend/platform/platform_xdk.c | 1 - settings.c | 10 ++++++---- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/console/rarch_console.h b/console/rarch_console.h index 526204e797..743d3fa062 100644 --- a/console/rarch_console.h +++ b/console/rarch_console.h @@ -38,7 +38,6 @@ typedef struct char port_dir[MAXIMUM_PATH]; char savestate_dir[MAXIMUM_PATH]; #if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) - char shader_file[MAXIMUM_PATH]; char shader_dir[MAXIMUM_PATH]; #endif char sram_dir[MAXIMUM_PATH]; diff --git a/frontend/menu/rmenu.c b/frontend/menu/rmenu.c index ec530d95d6..3f48f9b4ed 100644 --- a/frontend/menu/rmenu.c +++ b/frontend/menu/rmenu.c @@ -1588,7 +1588,7 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t } if (input & (1ULL << RMENU_DEVICE_NAV_START)) { - strlcpy(g_settings.video.cg_shader_path, default_paths.shader_file, sizeof(g_settings.video.cg_shader_path)); + strlcpy(g_settings.video.cg_shader_path, "", sizeof(g_settings.video.cg_shader_path)); if (g_settings.video.shader_type != RARCH_SHADER_NONE) { driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, NULL, RARCH_SHADER_INDEX_PASS0); diff --git a/frontend/platform/platform_ps3.c b/frontend/platform/platform_ps3.c index 12973165d3..403a317f3a 100644 --- a/frontend/platform/platform_ps3.c +++ b/frontend/platform/platform_ps3.c @@ -296,7 +296,6 @@ static void get_environment_settings(int argc, char *argv[]) snprintf(default_paths.border_dir, sizeof(default_paths.border_dir), "%s/borders", default_paths.core_dir); #if defined(HAVE_CG) || defined(HAVE_GLSL) snprintf(default_paths.shader_dir, sizeof(default_paths.shader_dir), "%s/shaders", default_paths.core_dir); - snprintf(default_paths.shader_file, sizeof(default_paths.shader_file), "%s/shaders/stock.cg", default_paths.core_dir); #endif #ifdef IS_SALAMANDER diff --git a/frontend/platform/platform_xdk.c b/frontend/platform/platform_xdk.c index c0aa7114ee..7306310c16 100644 --- a/frontend/platform/platform_xdk.c +++ b/frontend/platform/platform_xdk.c @@ -312,7 +312,6 @@ static void get_environment_settings(int argc, char *argv[]) #ifdef IS_SALAMANDER strlcpy(default_paths.config_path, "game:\\retroarch.cfg", sizeof(default_paths.config_path)); #else - strlcpy(default_paths.shader_file, "game:\\media\\shaders\\stock.cg", sizeof(default_paths.shader_file)); strlcpy(g_extern.config_path, "game:\\retroarch.cfg", sizeof(g_extern.config_path)); #endif strlcpy(default_paths.savestate_dir, "game:\\savestates", sizeof(default_paths.savestate_dir)); diff --git a/settings.c b/settings.c index caa10ee2a4..e31685cf25 100644 --- a/settings.c +++ b/settings.c @@ -244,9 +244,6 @@ void config_set_defaults(void) #ifdef RARCH_CONSOLE g_extern.lifecycle_mode_state |= ((1ULL << MODE_INFO_DRAW) | (1ULL << MODE_MENU)); -#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) - strlcpy(g_settings.video.cg_shader_path, default_paths.shader_file, sizeof(g_settings.video.cg_shader_path)); -#endif strlcpy(g_settings.system_directory, default_paths.system_dir, sizeof(g_settings.system_directory)); @@ -445,7 +442,12 @@ bool config_load_file(const char *path) CONFIG_GET_BOOL(video.aspect_ratio_auto, "video_aspect_ratio_auto"); CONFIG_GET_FLOAT(video.refresh_rate, "video_refresh_rate"); - CONFIG_GET_PATH(video.cg_shader_path, "video_cg_shader"); + if (config_get_path(conf, "video_cg_shader", tmp_str, sizeof(tmp_str))) + { + if (strlen(tmp_str) > 0) + strlcpy(g_settings.video.cg_shader_path, tmp_str, sizeof(g_settings.video.cg_shader_path)); + } + CONFIG_GET_PATH(video.xml_shader_path, "video_xml_shader"); CONFIG_GET_BOOL(video.allow_rotate, "video_allow_rotate");