static void blit(void)
{
- static uint32_t old_status, old_h;
+ static uint32_t old_status;
+ static int old_h;
int x = gpu.screen.x & ~1; // alignment needed by blitter
int y = gpu.screen.y;
int w = gpu.screen.w;
int h = gpu.screen.h;
+ uint16_t *vram = gpu.vram;
int stride = gpu.screen.hres;
- int doffs;
- uint16_t *srcs;
- uint8_t *dest;
+ int fb_offs, doffs;
+ uint8_t *dest;
- srcs = &gpu.vram[y * 1024 + x];
+ fb_offs = y * 1024 + x;
if ((gpu.status.reg ^ old_status) & ((7<<16)|(1<<21)) || h != old_h) // width|rgb24 change?
{
screen_buf = cbs->pl_vout_set_mode(stride, h, gpu.status.rgb24 ? 24 : 16);
}
- dest = screen_buf;
+ dest = (uint8_t *)screen_buf;
// only do centering, at least for now
doffs = (stride - w) / 2 & ~1;
{
#ifndef MAEMO
dest += (doffs / 8) * 24;
- for (; h-- > 0; dest += stride * 3, srcs += 1024)
+ for (; h-- > 0; dest += stride * 3, fb_offs += 1024)
{
- bgr888_to_rgb888(dest, srcs, w * 3);
+ fb_offs &= 1024*512-1;
+ bgr888_to_rgb888(dest, vram + fb_offs, w * 3);
}
#else
dest += doffs * 2;
- for (; h-- > 0; dest += stride * 2, srcs += 1024)
+ for (; h-- > 0; dest += stride * 2, fb_offs += 1024)
{
- bgr888_to_rgb565(dest, srcs, w * 3);
+ fb_offs &= 1024*512-1;
+ bgr888_to_rgb565(dest, vram + fb_offs, w * 3);
}
#endif
}
else
{
dest += doffs * 2;
- for (; h-- > 0; dest += stride * 2, srcs += 1024)
+ for (; h-- > 0; dest += stride * 2, fb_offs += 1024)
{
- bgr555_to_rgb565(dest, srcs, w * 2);
+ fb_offs &= 1024*512-1;
+ bgr555_to_rgb565(dest, vram + fb_offs, w * 2);
}
}
return;
if (gpu.frameskip.set) {
- if (!gpu.frameskip.frame_ready && gpu.frameskip.skipped_blits < 9) {
- gpu.frameskip.skipped_blits++;
- return;
+ if (!gpu.frameskip.frame_ready) {
+ if (*gpu.state.frame_count - gpu.frameskip.last_flip_frame < 9)
+ return;
}
gpu.frameskip.frame_ready = 0;
- gpu.frameskip.skipped_blits = 0;
}
renderer_flush_queues();
gpu.state.fb_dirty = 0;
}
-long GPUopen(void)
+long GPUopen(void **unused)
{
gpu.frameskip.active = 0;
gpu.frameskip.frame_ready = 1;
gpu.frameskip.advice = &cbs->fskip_advice;
gpu.frameskip.active = 0;
gpu.frameskip.frame_ready = 1;
+ gpu.state.hcnt = cbs->gpu_hcnt;
+ gpu.state.frame_count = cbs->gpu_frame_count;
}
// vim:shiftwidth=2:expandtab