Small filter fixes.

This commit is contained in:
Themaister 2014-04-15 12:22:01 +02:00
parent 6bdd5cf6ec
commit 4913683462
4 changed files with 8 additions and 3 deletions

View File

@ -1296,6 +1296,10 @@ void rarch_init_filter(enum retro_pixel_format colfmt)
if (!*g_settings.video.filter_path)
return;
// Deprecated format. Gets pre-converted.
if (colfmt == RETRO_PIXEL_FORMAT_0RGB1555)
colfmt = RETRO_PIXEL_FORMAT_RGB565;
if (g_extern.system.hw_render_callback.context_type)
{
RARCH_WARN("Cannot use CPU filters when hardware rendering is used.\n");
@ -1319,7 +1323,6 @@ void rarch_init_filter(enum retro_pixel_format colfmt)
return;
}
rarch_softfilter_get_max_output_size(g_extern.filter.filter, &pow2_x, &pow2_y);
pow2_x = next_pow2(pow2_x);
pow2_y = next_pow2(pow2_y);

View File

@ -920,7 +920,7 @@ static void menu_parse_and_resolve(void *data, unsigned menu_type)
else if (menu_type_is(menu_type) == RGUI_SETTINGS_SHADER_OPTIONS)
exts = "cg|glsl";
else if (menu_type == RGUI_SETTINGS_VIDEO_SOFTFILTER)
exts = "so";
exts = EXT_EXECUTABLES;
else if (menu_type == RGUI_SETTINGS_OVERLAY_PRESET)
exts = "cfg";
else if (menu_type_is(menu_type) == RGUI_FILE_DIRECTORY)

View File

@ -157,7 +157,7 @@
# Defines a directory where shaders (Cg, CGP, XML) are kept for easy access.
# video_shader_dir =
# CPU-based filter. Path to a bSNES CPU filter (*.filter)
# CPU-based filter. Path to a dynamic library.
# video_filter =
# Path to a TTF font used for rendering messages. This path must be defined to enable fonts.

View File

@ -393,6 +393,7 @@ void config_set_defaults(void)
*g_settings.video.shader_path = '\0';
*g_settings.video.shader_dir = '\0';
*g_settings.video.filter_dir = '\0';
*g_settings.video.filter_path = '\0';
#ifdef HAVE_MENU
*g_settings.rgui_content_directory = '\0';
*g_settings.rgui_config_directory = '\0';
@ -1320,6 +1321,7 @@ bool config_save_file(const char *path)
config_set_path(conf, "savefile_directory", *g_extern.savefile_dir ? g_extern.savefile_dir : "default");
config_set_path(conf, "savestate_directory", *g_extern.savestate_dir ? g_extern.savestate_dir : "default");
config_set_path(conf, "video_shader_dir", *g_settings.video.shader_dir ? g_settings.video.shader_dir : "default");
config_set_path(conf, "video_filter", g_settings.video.filter_path);
config_set_path(conf, "video_filter_dir", *g_settings.video.filter_dir ? g_settings.video.filter_dir : "default");
config_set_path(conf, "content_directory", *g_settings.content_directory ? g_settings.content_directory : "default");