libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 00:20:01 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Revert "Cleanups"

Browse Source 
This reverts commit a9c8cf205d.
This commit is contained in:
twinaphex 2020-06-26 18:39:34 +02:00
parent a9c8cf205d
commit 1fda1e0b28
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
gfx/video_filter.c
View File

@ -43,27 +43,6 @@ struct rarch_soft_plug
const struct softfilter_implementation *impl;
};
struct rarch_softfilter
{
config_file_t *conf;
const struct softfilter_implementation *impl;
void *impl_data;
struct rarch_soft_plug *plugs;
unsigned num_plugs;
unsigned max_width, max_height;
enum retro_pixel_format pix_fmt, out_pix_fmt;
struct softfilter_work_packet *packets;
unsigned threads;
#ifdef HAVE_THREADS
struct filter_thread_data *thread_data;
#endif
};
#ifdef HAVE_THREADS
#include <rthreads/rthreads.h>
@ -105,6 +84,27 @@ static void filter_thread_loop(void *data)
}
#endif
struct rarch_softfilter
{
config_file_t *conf;
const struct softfilter_implementation *impl;
void *impl_data;
struct rarch_soft_plug *plugs;
unsigned num_plugs;
unsigned max_width, max_height;
enum retro_pixel_format pix_fmt, out_pix_fmt;
struct softfilter_work_packet *packets;
unsigned threads;
#ifdef HAVE_THREADS
struct filter_thread_data *thread_data;
#endif
};
static const struct softfilter_implementation *
softfilter_find_implementation(rarch_softfilter_t *filt, const char *ident)
{
@ -537,8 +537,7 @@ void rarch_softfilter_process(rarch_softfilter_t *filt,
output, output_stride, input, width, height, input_stride);
#ifdef HAVE_THREADS
if (filt->threads > 1)
{
if(filt->threads>1){
/* Fire off workers */
for (i = 0; i < filt->threads; i++)
{
@ -563,10 +562,12 @@ void rarch_softfilter_process(rarch_softfilter_t *filt,
scond_wait(filt->thread_data[i].cond, filt->thread_data[i].lock);
slock_unlock(filt->thread_data[i].lock);
}
return;
} else {
for (i = 0; i < filt->threads; i++)
filt->packets[i].work(filt->impl_data, filt->packets[i].thread_data);
}
#endif
#else
for (i = 0; i < filt->threads; i++)
filt->packets[i].work(filt->impl_data, filt->packets[i].thread_data);
#endif
}