CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-22 18:58:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(SoftFilter) Build fixes for non_HAVE_DYLIB

Browse Source
This commit is contained in:
twinaphex 2014-08-19 19:45:19 +02:00
parent 4dea8caa6f
commit 459c27e11f
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gfx/filter.c
View File

@ -224,6 +224,7 @@ static const struct softfilter_config softfilter_config = {
static bool create_softfilter_graph(rarch_softfilter_t *filt, static bool create_softfilter_graph(rarch_softfilter_t *filt,
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,
softfilter_simd_mask_t cpu_features,
unsigned threads) unsigned threads)
{ {
unsigned input_fmts, input_fmt, output_fmts; unsigned input_fmts, input_fmt, output_fmts;
@ -283,7 +284,7 @@ static bool create_softfilter_graph(rarch_softfilter_t *filt,
filt->max_height = max_height; filt->max_height = max_height;
filt->impl_data = filt->impl->create(&softfilter_config, input_fmt, input_fmt, max_width, max_height, filt->impl_data = filt->impl->create(&softfilter_config, input_fmt, input_fmt, max_width, max_height,
threads != RARCH_SOFTFILTER_THREADS_AUTO ? threads : rarch_get_cpu_cores(), rarch_get_cpu_features(), threads != RARCH_SOFTFILTER_THREADS_AUTO ? threads : rarch_get_cpu_cores(), cpu_features,
&userdata); &userdata);
if (!filt->impl_data) if (!filt->impl_data)
{ {
@ -441,7 +442,7 @@ rarch_softfilter_t *rarch_softfilter_new(const char *filter_config,
#if !defined(HAVE_FILTERS_BUILTIN) && defined(HAVE_DYLIB) #if !defined(HAVE_FILTERS_BUILTIN) && defined(HAVE_DYLIB)
char basedir[PATH_MAX]; char basedir[PATH_MAX];
#endif #endif
unsigned 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 = (rarch_softfilter_t*)calloc(1, sizeof(*filt)); rarch_softfilter_t *filt = (rarch_softfilter_t*)calloc(1, sizeof(*filt));
@ -473,7 +474,7 @@ rarch_softfilter_t *rarch_softfilter_new(const char *filter_config,
#endif #endif
if (!create_softfilter_graph(filt, in_pixel_format, if (!create_softfilter_graph(filt, in_pixel_format,
max_width, max_height, threads)) max_width, max_height, cpu_features, threads))
goto error; goto error;
return filt; return filt;
@ -486,7 +487,7 @@ error:
void rarch_softfilter_free(rarch_softfilter_t *filt) void rarch_softfilter_free(rarch_softfilter_t *filt)
{ {
unsigned i; unsigned i = 0;
(void)i; (void)i;
if (!filt) if (!filt)

5
griffin/griffin.c
View File

@ -464,10 +464,7 @@ FILTERS
#include "../gfx/filters/darken.c" #include "../gfx/filters/darken.c"
#include "../gfx/filters/epx.c" #include "../gfx/filters/epx.c"
#include "../gfx/filters/scale2x.c" #include "../gfx/filters/scale2x.c"
#include "../gfx/filters/blargg_ntsc_snes_rf.c" #include "../gfx/filters/blargg_ntsc_snes.c"
#include "../gfx/filters/blargg_ntsc_snes_composite.c"
#include "../gfx/filters/blargg_ntsc_snes_svideo.c"
#include "../gfx/filters/blargg_ntsc_snes_rgb.c"
#include "../gfx/filters/lq2x.c" #include "../gfx/filters/lq2x.c"
#include "../gfx/filters/phosphor2x.c" #include "../gfx/filters/phosphor2x.c"