Use Shader Options from now on

This commit is contained in:
twinaphex 2015-03-04 20:22:07 +01:00
parent fc894f981e
commit fa4464586e
2 changed files with 5 additions and 46 deletions

View File

@ -19,8 +19,12 @@ for f in *_ps3.a ; do
whole_archive="WHOLE_ARCHIVE_LINK=1"
echo $name yes
fi
if [ $name = "tyrquake" ] ; then
echo "Tyrquake found, applying big stack..."
big_stack="BIG_STACK=1"
fi
cp -f "$f" ../libretro_ps3.a
make -C ../ -f Makefile.ps3 $whole_archive -j3 || exit 1
make -C ../ -f Makefile.ps3 $whole_archive $big_stack -j3 || exit 1
$MAKE_FSELF_NPDRM ../retroarch_ps3.elf ../CORE.SELF
mv -f ../CORE.SELF ../ps3/pkg/USRDIR/cores/"${name}_libretro_ps3.SELF"
rm -f ../retroarch_ps3.elf ../retroarch_ps3.self ../CORE.SELF

View File

@ -4305,45 +4305,6 @@ static bool setting_data_append_list_video_options(
return true;
}
static bool setting_data_append_list_shader_options(
rarch_setting_t **list,
rarch_setting_info_t *list_info)
{
rarch_setting_group_info_t group_info;
rarch_setting_group_info_t subgroup_info;
START_GROUP(group_info, "Shader Settings");
START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info);
CONFIG_BOOL(
g_settings.video.shader_enable,
"video_shader_enable",
"Enable Shaders",
shader_enable,
"OFF",
"ON",
group_info.name,
subgroup_info.name,
NULL,
NULL);
CONFIG_PATH(
g_settings.video.shader_path,
"video_shader",
"Shader",
"",
group_info.name,
subgroup_info.name,
NULL,
NULL);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ALLOW_EMPTY);
END_SUB_GROUP(list, list_info);
END_GROUP(list, list_info);
return true;
}
static bool setting_data_append_list_font_options(
rarch_setting_t **list,
rarch_setting_info_t *list_info)
@ -6135,12 +6096,6 @@ rarch_setting_t *setting_data_new(unsigned mask)
goto error;
}
if (mask & SL_FLAG_SHADER_OPTIONS)
{
if (!setting_data_append_list_shader_options(&list, list_info))
goto error;
}
if (mask & SL_FLAG_FONT_OPTIONS)
{
if (!setting_data_append_list_font_options(&list, list_info))