X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=plugins%2Fgpulib%2Fgpu.c;h=ed04d7314db98eaeb1f9c2ebfc0069bf1b5514e2;hb=8659d7fd2cdb11f63724ead0997f47f4c694f8c2;hp=797431c04937f90dd5095223c71279e5a8a83942;hpb=08b333774702ffc2d6a61bb0c8d690d9946a65c7;p=pcsx_rearmed.git diff --git a/plugins/gpulib/gpu.c b/plugins/gpulib/gpu.c index 797431c0..ed04d731 100644 --- a/plugins/gpulib/gpu.c +++ b/plugins/gpulib/gpu.c @@ -606,7 +606,7 @@ void GPUwriteData(uint32_t data) flush_cmd_buffer(); } -long GPUdmaChain(uint32_t *rambase, uint32_t start_addr) +long GPUdmaChain(uint32_t *rambase, uint32_t start_addr, uint32_t *progress_addr) { uint32_t addr, *list, ld_addr = 0; int len, left, count; @@ -630,14 +630,28 @@ long GPUdmaChain(uint32_t *rambase, uint32_t start_addr) if (len > 0) cpu_cycles += 5 + len; - log_io(".chain %08x #%d\n", (list - rambase) * 4, len); + log_io(".chain %08lx #%d+%d\n", + (long)(list - rambase) * 4, len, gpu.cmd_len); + if (unlikely(gpu.cmd_len > 0)) { + memcpy(gpu.cmd_buffer + gpu.cmd_len, list + 1, len * 4); + gpu.cmd_len += len; + flush_cmd_buffer(); + continue; + } if (len) { left = do_cmd_buffer(list + 1, len); - if (left) - log_anomaly("GPUdmaChain: discarded %d/%d words\n", left, len); + if (left) { + memcpy(gpu.cmd_buffer, list + 1 + len - left, left * 4); + gpu.cmd_len = left; + log_anomaly("GPUdmaChain: %d/%d words left\n", left, len); + } } + if (progress_addr) { + *progress_addr = addr; + break; + } #define LD_THRESHOLD (8*1024) if (count >= LD_THRESHOLD) { if (count == LD_THRESHOLD) {