CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-03-05 09:57:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(PS3/360) Now uses embedded shaders instead of stock shader from

Browse Source 
common-shaders
This commit is contained in:
twinaphex 2013-04-06 21:53:03 +02:00
parent 142c6335c9
commit cc05981455
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
console/rarch_console.h
View File

@ -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];

2
frontend/menu/rmenu.c
View File

@ -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);

1
frontend/platform/platform_ps3.c
View File

@ -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

1
frontend/platform/platform_xdk.c
View File

@ -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));

10
settings.c
View File

@ -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");