#define noinline __attribute__((noinline))
#define gpu_log(fmt, ...) \
- printf("%d:%03d: " fmt, gpu.state.frame_count, *gpu.state.hcnt, ##__VA_ARGS__)
+ printf("%d:%03d: " fmt, *gpu.state.frame_count, *gpu.state.hcnt, ##__VA_ARGS__)
//#define log_io gpu_log
#define log_io(...)
{
gpu.frameskip.frame_ready = !gpu.frameskip.active;
- if (!gpu.frameskip.active && *gpu.frameskip.advice)
+ if (!gpu.frameskip.active && (*gpu.frameskip.advice || gpu.frameskip.set == 1))
gpu.frameskip.active = 1;
else
gpu.frameskip.active = 0;
ret = vout_init();
ret |= renderer_init();
- gpu.lcf_hc = &gpu.zero;
- gpu.state.frame_count = 0;
+ gpu.state.frame_count = &gpu.zero;
gpu.state.hcnt = &gpu.zero;
do_reset();
return ret;
case 0x05:
gpu.screen.x = data & 0x3ff;
gpu.screen.y = (data >> 10) & 0x3ff;
- if (gpu.frameskip.enabled)
+ if (gpu.frameskip.set && gpu.frameskip.last_flip_frame != *gpu.state.frame_count) {
decide_frameskip();
+ gpu.frameskip.last_flip_frame = *gpu.state.frame_count;
+ }
break;
case 0x06:
gpu.screen.x1 = data & 0xfff;
//printf(" %3d: %02x %d\n", pos, cmd, len);
if ((cmd & 0xf4) == 0x24) {
// flat textured prim
- gpu.status.reg &= ~0x1ff;
- gpu.status.reg |= list[4] & 0x1ff;
+ gpu.ex_regs[1] &= ~0x1ff;
+ gpu.ex_regs[1] |= list[4] & 0x1ff;
}
else if ((cmd & 0xf4) == 0x34) {
// shaded textured prim
- gpu.status.reg &= ~0x1ff;
- gpu.status.reg |= list[5] & 0x1ff;
+ gpu.ex_regs[1] &= ~0x1ff;
+ gpu.ex_regs[1] |= list[5] & 0x1ff;
}
- else switch (cmd)
+ else if (cmd == 0xe3)
{
- case 0xe1:
- gpu.status.reg &= ~0x7ff;
- gpu.status.reg |= list[0] & 0x7ff;
- break;
- case 0xe6:
- gpu.status.reg &= ~0x1800;
- gpu.status.reg |= (list[0] & 3) << 11;
- break;
+ // no frameskip if it decides to draw to display area,
+ // but not for interlace since it'll most likely always do that
+ uint32_t x = list[0] & 0x3ff;
+ uint32_t y = (list[0] >> 10) & 0x3ff;
+ gpu.frameskip.allow = gpu.status.interlace ||
+ (uint32_t)(x - gpu.screen.x) >= (uint32_t)gpu.screen.w ||
+ (uint32_t)(y - gpu.screen.y) >= (uint32_t)gpu.screen.h;
}
if (2 <= cmd && cmd < 0xc0)
vram_dirty = 1;
}
if (pos - start > 0) {
- if (!gpu.frameskip.active)
+ if (!gpu.frameskip.active || !gpu.frameskip.allow)
do_cmd_list(data + start, pos - start);
start = pos;
}
break;
}
+ gpu.status.reg &= ~0x1fff;
+ gpu.status.reg |= gpu.ex_regs[1] & 0x7ff;
+ gpu.status.reg |= (gpu.ex_regs[6] & 3) << 11;
+
if (gpu.frameskip.active)
renderer_sync_ecmds(gpu.ex_regs);
gpu.state.fb_dirty |= vram_dirty;
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.words > 1024)
+ if (*gpu.state.frame_count == gpu.state.last_list.frame &&
+ *gpu.state.hcnt - gpu.state.last_list.hcnt <= 1 &&
+ gpu.state.last_list.words > 1024)
{
llist_entry = rambase + (gpu.state.last_list.addr & 0x1fffff) / 4;
*llist_entry |= 0x800000;
if (llist_entry)
*llist_entry &= ~0x800000;
- gpu.state.last_list.frame = gpu.state.frame_count;
+ gpu.state.last_list.frame = *gpu.state.frame_count;
gpu.state.last_list.hcnt = *gpu.state.hcnt;
gpu.state.last_list.words = dma_words;
gpu.state.last_list.addr = start_addr;
if (unlikely(gpu.cmd_len > 0))
flush_cmd_buffer();
- ret = gpu.status.reg | (*gpu.lcf_hc << 31);
+ ret = gpu.status.reg;
log_io("gpu_read_status %08x\n", ret);
return ret;
}
-typedef struct GPUFREEZETAG
+struct GPUFreeze
{
uint32_t ulFreezeVersion; // should be always 1 for now (set by main emu)
uint32_t ulStatus; // current gpu status
uint32_t ulControl[256]; // latest control register values
unsigned char psxVRam[1024*1024*2]; // current VRam image (full 2 MB for ZN)
-} GPUFreeze_t;
+};
-long GPUfreeze(uint32_t type, GPUFreeze_t *freeze)
+long GPUfreeze(uint32_t type, struct GPUFreeze *freeze)
{
int i;
return 1;
}
-void GPUvBlank(int val, uint32_t *hcnt)
-{
- gpu.lcf_hc = &gpu.zero;
- if (gpu.status.interlace) {
- if (val)
- gpu.status.lcf ^= 1;
- }
- else {
- gpu.status.lcf = 0;
- if (!val)
- gpu.lcf_hc = hcnt;
- }
- if (!val)
- gpu.state.frame_count++;
-
- gpu.state.hcnt = hcnt;
-}
-
// vim:shiftwidth=2:expandtab