mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups to gfx/video_filter.c

Browse Source
This commit is contained in:
twinaphex 2015-01-07 21:48:42 +01:00
parent 9fee7f5c80
commit 72c502fd78
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gfx/video_filter.c
View File

@ -315,11 +315,14 @@ static const softfilter_get_implementation_t soft_plugs_builtin[] = {
scale2x_get_implementation, scale2x_get_implementation,
}; };
static bool append_softfilter_plugs(rarch_softfilter_t *filt) static bool append_softfilter_plugs(rarch_softfilter_t *filt,
struct string_list *list)
{ {
unsigned i; unsigned i;
softfilter_simd_mask_t mask = rarch_get_cpu_features(); softfilter_simd_mask_t mask = rarch_get_cpu_features();
(void)list;
filt->plugs = (struct rarch_soft_plug*) filt->plugs = (struct rarch_soft_plug*)
calloc(ARRAY_SIZE(soft_plugs_builtin), sizeof(*filt->plugs)); calloc(ARRAY_SIZE(soft_plugs_builtin), sizeof(*filt->plugs));
if (!filt->plugs) if (!filt->plugs)
@ -347,13 +350,14 @@ rarch_softfilter_t *rarch_softfilter_new(const char *filter_config,
enum retro_pixel_format in_pixel_format, enum retro_pixel_format in_pixel_format,
unsigned max_width, unsigned max_height) unsigned max_width, unsigned max_height)
{ {
#if defined(HAVE_DYLIB)
char basedir[PATH_MAX]; char basedir[PATH_MAX];
#endif
softfilter_simd_mask_t cpu_features = rarch_get_cpu_features(); softfilter_simd_mask_t cpu_features = rarch_get_cpu_features();
struct string_list *plugs = NULL; struct string_list *plugs = NULL;
rarch_softfilter_t *filt = NULL;
rarch_softfilter_t *filt = (rarch_softfilter_t*)calloc(1, sizeof(*filt)); (void)basedir;
filt = (rarch_softfilter_t*)calloc(1, sizeof(*filt));
if (!filt) if (!filt)
return NULL; return NULL;
@ -370,16 +374,13 @@ rarch_softfilter_t *rarch_softfilter_new(const char *filter_config,
plugs = dir_list_new(basedir, EXT_EXECUTABLES, false); plugs = dir_list_new(basedir, EXT_EXECUTABLES, false);
if (!plugs) if (!plugs)
goto error; goto error;
#endif
if (!append_softfilter_plugs(filt, plugs)) if (!append_softfilter_plugs(filt, plugs))
goto error; goto error;
string_list_free(plugs); if (plugs)
string_list_free(plugs);
plugs = NULL; plugs = NULL;
#else
if (!append_softfilter_plugs(filt))
goto error;
#endif
if (!create_softfilter_graph(filt, in_pixel_format, if (!create_softfilter_graph(filt, in_pixel_format,
max_width, max_height, cpu_features, threads)) max_width, max_height, cpu_features, threads))
@ -388,7 +389,9 @@ rarch_softfilter_t *rarch_softfilter_new(const char *filter_config,
return filt; return filt;
error: error:
string_list_free(plugs); if (plugs)
string_list_free(plugs);
plugs = NULL;
rarch_softfilter_free(filt); rarch_softfilter_free(filt);
return NULL; return NULL;
} }