From: notaz Date: Sun, 21 Jan 2024 21:14:27 +0000 (+0200) Subject: spu: add missing sample copying for thread mode X-Git-Tag: r24l~2 X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92aae0e552638897a09979533247f28f875d9bed;p=pcsx_rearmed.git spu: add missing sample copying for thread mode was probably a bad idea keeping them separate --- diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h index 2b593ec7..ac0960f6 100644 --- a/plugins/dfsound/externals.h +++ b/plugins/dfsound/externals.h @@ -273,15 +273,15 @@ typedef struct extern SPUInfo spu; -void do_samples(unsigned int cycles_to, int do_sync); +void do_samples(unsigned int cycles_to, int force_no_thread); void schedule_next_irq(void); void check_irq_io(unsigned int addr); void do_irq_io(int cycles_after); -#define do_samples_if_needed(c, sync, samples) \ +#define do_samples_if_needed(c, no_thread, samples) \ do { \ - if (sync || (int)((c) - spu.cycles_played) >= (samples) * 768) \ - do_samples(c, sync); \ + if ((no_thread) || (int)((c) - spu.cycles_played) >= (samples) * 768) \ + do_samples(c, no_thread); \ } while (0) #endif diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c index 0e4b154e..ad86cabc 100644 --- a/plugins/dfsound/spu.c +++ b/plugins/dfsound/spu.c @@ -859,11 +859,14 @@ static void do_samples_finish(int *SSumLR, int ns_to, static struct spu_worker { union { struct { - unsigned int exit_thread; + unsigned char exit_thread; + unsigned char prev_work_in_thread; + unsigned char pad[2]; unsigned int i_ready; unsigned int i_reaped; unsigned int last_boot_cnt; // dsp unsigned int ram_dirty; + unsigned int channels_last; }; // aligning for C64X_DSP unsigned int _pad0[128/4]; @@ -954,6 +957,16 @@ static void queue_channel_work(int ns_to, unsigned int silentch) work->decode_pos = spu.decode_pos; work->channels_silent = silentch; + if (!worker->prev_work_in_thread) { + // copy adpcm and interpolation state to sb_thread + worker->prev_work_in_thread = 1; + mask = spu.dwChannelsAudible & ~spu.dwNewChannel & 0xffffff; + for (ch = 0; mask != 0; ch++, mask >>= 1) { + if (mask & 1) + memcpy(spu.sb_thread[ch].SB, spu.sb[ch].SB, sizeof(spu.sb_thread[ch].SB)); + } + } + mask = work->channels_new = spu.dwNewChannel & 0xffffff; for (ch = 0; mask != 0; ch++, mask >>= 1) { if (mask & 1) @@ -961,6 +974,7 @@ static void queue_channel_work(int ns_to, unsigned int silentch) } mask = work->channels_on = spu.dwChannelsAudible & 0xffffff; + worker->channels_last = mask; spu.decode_dirty_ch |= mask & 0x0a; for (ch = 0; mask != 0; ch++, mask >>= 1) @@ -1095,8 +1109,9 @@ static void do_channel_work(struct work_item *work) REVERBDo(work->SSumLR, RVB, ns_to, work->rvb_addr); } -static void sync_worker_thread(int force) +static void sync_worker_thread(int force_no_thread) { + int force = force_no_thread; struct work_item *work; int done, used_space; @@ -1121,14 +1136,21 @@ static void sync_worker_thread(int force) done = thread_get_i_done() - worker->i_reaped; used_space = worker->i_ready - worker->i_reaped; } - if (force) + if (force_no_thread && worker->prev_work_in_thread) { + unsigned int ch, mask = worker->channels_last; + worker->prev_work_in_thread = 0; thread_sync_caches(); + for (ch = 0; mask != 0; ch++, mask >>= 1) { + if (mask & 1) + memcpy(spu.sb[ch].SB, spu.sb_thread[ch].SB, sizeof(spu.sb_thread[ch].SB)); + } + } } #else static void queue_channel_work(int ns_to, int silentch) {} -static void sync_worker_thread(int force) {} +static void sync_worker_thread(int force_no_thread) {} static const void * const worker = NULL; @@ -1139,7 +1161,7 @@ static const void * const worker = NULL; // here is the main job handler... //////////////////////////////////////////////////////////////////////// -void do_samples(unsigned int cycles_to, int do_direct) +void do_samples(unsigned int cycles_to, int force_no_thread) { unsigned int silentch; int cycle_diff; @@ -1155,9 +1177,9 @@ void do_samples(unsigned int cycles_to, int do_direct) silentch = ~(spu.dwChannelsAudible | spu.dwNewChannel) & 0xffffff; - do_direct |= (silentch == 0xffffff); + force_no_thread |= (silentch == 0xffffff); if (worker != NULL) - sync_worker_thread(do_direct); + sync_worker_thread(force_no_thread); if (cycle_diff < 2 * 768) return; @@ -1205,7 +1227,7 @@ void do_samples(unsigned int cycles_to, int do_direct) if (unlikely(spu.rvb->dirty)) REVERBPrep(); - if (do_direct || worker == NULL || !spu_config.iUseThread) { + if (force_no_thread || worker == NULL || !spu_config.iUseThread) { do_channels(ns_to); do_samples_finish(spu.SSumLR, ns_to, silentch, spu.decode_pos); }