diff options
| author | notaz | 2015-02-06 01:29:00 +0200 |
|---|---|---|
| committer | notaz | 2015-02-06 01:29:00 +0200 |
| commit | 2af7e74feec67c0a798ac190774cb4b3e925be76 (patch) | |
| tree | 27a148679e25f6edb7a2dd85c54514139bb72450 /plugins/gpulib | |
| parent | cebb70f24ab54693b12aaa27b85a52689e26e1ff (diff) | |
| parent | 1e0eac2348343c8a046f7a75d460f087556cf7f6 (diff) | |
| download | pcsx_rearmed-2af7e74feec67c0a798ac190774cb4b3e925be76.tar.gz pcsx_rearmed-2af7e74feec67c0a798ac190774cb4b3e925be76.tar.bz2 pcsx_rearmed-2af7e74feec67c0a798ac190774cb4b3e925be76.zip | |
Merge branch 'upstream' into libretro
Diffstat (limited to 'plugins/gpulib')
| -rw-r--r-- | plugins/gpulib/gpu.c | 14 | ||||
| -rw-r--r-- | plugins/gpulib/vout_pl.c | 3 |
2 files changed, 2 insertions, 15 deletions
diff --git a/plugins/gpulib/gpu.c b/plugins/gpulib/gpu.c index 0e6fe63..125bd89 100644 --- a/plugins/gpulib/gpu.c +++ b/plugins/gpulib/gpu.c @@ -21,7 +21,6 @@ #define unlikely(x) #define preload(...) #define noinline -#error huh #endif #define gpu_log(fmt, ...) \ @@ -522,7 +521,6 @@ void GPUwriteData(uint32_t data) long GPUdmaChain(uint32_t *rambase, uint32_t start_addr) { uint32_t addr, *list, ld_addr = 0; - uint32_t *llist_entry = NULL; int len, left, count; long cpu_cycles = 0; @@ -531,15 +529,6 @@ long GPUdmaChain(uint32_t *rambase, uint32_t start_addr) if (unlikely(gpu.cmd_len > 0)) flush_cmd_buffer(); - // ff7 sends it's main list twice, detect this - if (*gpu.state.frame_count == gpu.state.last_list.frame && - *gpu.state.hcnt - gpu.state.last_list.hcnt <= 1 && - gpu.state.last_list.cycles > 2048) - { - llist_entry = rambase + (gpu.state.last_list.addr & 0x1fffff) / 4; - *llist_entry |= 0x800000; - } - log_io("gpu_dma_chain\n"); addr = start_addr & 0xffffff; for (count = 0; (addr & 0x800000) == 0; count++) @@ -586,9 +575,6 @@ long GPUdmaChain(uint32_t *rambase, uint32_t start_addr) } } - if (llist_entry) - *llist_entry &= ~0x800000; - gpu.state.last_list.frame = *gpu.state.frame_count; gpu.state.last_list.hcnt = *gpu.state.hcnt; gpu.state.last_list.cycles = cpu_cycles; diff --git a/plugins/gpulib/vout_pl.c b/plugins/gpulib/vout_pl.c index 541b5e0..a9437cb 100644 --- a/plugins/gpulib/vout_pl.c +++ b/plugins/gpulib/vout_pl.c @@ -89,11 +89,12 @@ void vout_blank(void) { int w = gpu.screen.hres; int h = gpu.screen.h; + + check_mode_change(0); if (gpu.state.enhancement_active) { w *= 2; h *= 2; } - check_mode_change(0); cbs->pl_vout_flip(NULL, 1024, gpu.status.rgb24, w, h); } |