notaz.gp2x.de
/
pcsx_rearmed.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fc4803b
)
gpulib: remove unneeded hack
author
notaz
<notasas@gmail.com>
Thu, 5 Feb 2015 00:37:56 +0000
(
02:37
+0200)
committer
notaz
<notasas@gmail.com>
Thu, 5 Feb 2015 00:37:56 +0000
(
02:37
+0200)
plugins/gpulib/gpu.c
patch
|
blob
|
blame
|
history
diff --git
a/plugins/gpulib/gpu.c
b/plugins/gpulib/gpu.c
index
0e6fe63
..
125bd89
100644
(file)
--- a/
plugins/gpulib/gpu.c
+++ b/
plugins/gpulib/gpu.c
@@
-21,7
+21,6
@@
#define unlikely(x)
#define preload(...)
#define noinline
#define unlikely(x)
#define preload(...)
#define noinline
-#error huh
#endif
#define gpu_log(fmt, ...) \
#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;
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;
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();
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++)
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;
gpu.state.last_list.frame = *gpu.state.frame_count;
gpu.state.last_list.hcnt = *gpu.state.hcnt;
gpu.state.last_list.cycles = cpu_cycles;