notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cdrom: forget old sector on cd change
[pcsx_rearmed.git]
/
plugins
/
gpulib
/
gpu.c
diff --git
a/plugins/gpulib/gpu.c
b/plugins/gpulib/gpu.c
index
d729091
..
f034812
100644
(file)
--- a/
plugins/gpulib/gpu.c
+++ b/
plugins/gpulib/gpu.c
@@
-54,6
+54,7
@@
static noinline void do_cmd_reset(void)
static noinline void do_reset(void)
{
unsigned int i;
static noinline void do_reset(void)
{
unsigned int i;
+
do_cmd_reset();
memset(gpu.regs, 0, sizeof(gpu.regs));
do_cmd_reset();
memset(gpu.regs, 0, sizeof(gpu.regs));
@@
-136,14
+137,13
@@
static noinline void get_gpu_info(uint32_t data)
gpu.gp0 = gpu.ex_regs[data & 7] & 0xfffff;
break;
case 0x05:
gpu.gp0 = gpu.ex_regs[data & 7] & 0xfffff;
break;
case 0x05:
- case 0x06:
gpu.gp0 = gpu.ex_regs[5] & 0x3fffff;
break;
case 0x07:
gpu.gp0 = 2;
break;
default:
gpu.gp0 = gpu.ex_regs[5] & 0x3fffff;
break;
case 0x07:
gpu.gp0 = 2;
break;
default:
- gpu.gp0 = 0;
+ // gpu.gp0 unchanged
break;
}
}
break;
}
}
@@
-606,7
+606,7
@@
void GPUwriteData(uint32_t data)
flush_cmd_buffer();
}
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;
{
uint32_t addr, *list, ld_addr = 0;
int len, left, count;
@@
-638,6
+638,10
@@
long GPUdmaChain(uint32_t *rambase, uint32_t start_addr)
log_anomaly("GPUdmaChain: discarded %d/%d words\n", left, len);
}
log_anomaly("GPUdmaChain: discarded %d/%d words\n", left, len);
}
+ if (progress_addr) {
+ *progress_addr = addr;
+ break;
+ }
#define LD_THRESHOLD (8*1024)
if (count >= LD_THRESHOLD) {
if (count == LD_THRESHOLD) {
#define LD_THRESHOLD (8*1024)
if (count >= LD_THRESHOLD) {
if (count == LD_THRESHOLD) {