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
remove gpu vblank callbacks
[pcsx_rearmed.git]
/
plugins
/
gpu_neon
/
vout_fb.c
diff --git
a/plugins/gpu_neon/vout_fb.c
b/plugins/gpu_neon/vout_fb.c
index
f80a29f
..
344c755
100644
(file)
--- a/
plugins/gpu_neon/vout_fb.c
+++ b/
plugins/gpu_neon/vout_fb.c
@@
-10,7
+10,7
@@
#include "gpu.h"
#include "../../frontend/plugin_lib.h"
#include "gpu.h"
#include "../../frontend/plugin_lib.h"
-#include "../../frontend/
arm_utils
.h"
+#include "../../frontend/
cspace
.h"
static const struct rearmed_cbs *cbs;
static void *screen_buf;
static const struct rearmed_cbs *cbs;
static void *screen_buf;
@@
-27,26
+27,27
@@
int vout_finish(void)
static void blit(void)
{
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;
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 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?
{
old_status = gpu.status.reg;
old_h = h;
if ((gpu.status.reg ^ old_status) & ((7<<16)|(1<<21)) || h != old_h) // width|rgb24 change?
{
old_status = gpu.status.reg;
old_h = h;
- screen_buf = cbs->pl_
fbdev
_set_mode(stride, h, gpu.status.rgb24 ? 24 : 16);
+ 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;
// only do centering, at least for now
doffs = (stride - w) / 2 & ~1;
@@
-55,63
+56,76
@@
static void blit(void)
{
#ifndef MAEMO
dest += (doffs / 8) * 24;
{
#ifndef MAEMO
dest += (doffs / 8) * 24;
- for (; h-- > 0; dest += stride * 3,
src
s += 1024)
+ for (; h-- > 0; dest += stride * 3,
fb_off
s += 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;
}
#else
dest += doffs * 2;
- for (; h-- > 0; dest += stride * 2,
src
s += 1024)
+ for (; h-- > 0; dest += stride * 2,
fb_off
s += 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;
}
#endif
}
else
{
dest += doffs * 2;
- for (; h-- > 0; dest += stride * 2,
src
s += 1024)
+ for (; h-- > 0; dest += stride * 2,
fb_off
s += 1024)
{
{
- bgr555_to_rgb565(dest, srcs, w * 2);
+ fb_offs &= 1024*512-1;
+ bgr555_to_rgb565(dest, vram + fb_offs, w * 2);
}
}
}
}
- screen_buf = cbs->pl_
fbdev
_flip();
+ screen_buf = cbs->pl_
vout
_flip();
}
void GPUupdateLace(void)
{
}
void GPUupdateLace(void)
{
- if (gpu.
frameskip.enabled && !gpu.frameskip.frame_read
y)
+ if (gpu.
status.blanking || !gpu.state.fb_dirt
y)
return;
return;
- if (!gpu.status.blanking && gpu.state.fb_dirty) {
- blit();
- gpu.state.fb_dirty = 0;
+ if (gpu.frameskip.set) {
+ if (!gpu.frameskip.frame_ready && gpu.frameskip.skipped_blits < 9) {
+ gpu.frameskip.skipped_blits++;
+ return;
+ }
+ gpu.frameskip.frame_ready = 0;
+ gpu.frameskip.skipped_blits = 0;
}
}
+
+ renderer_flush_queues();
+ blit();
+ gpu.state.fb_dirty = 0;
}
long GPUopen(void)
{
}
long GPUopen(void)
{
- gpu.frameskip.
enabled = cbs->frameskip
;
- gpu.frameskip.
advice = &cbs->fskip_advice
;
+ gpu.frameskip.
active = 0
;
+ gpu.frameskip.
frame_ready = 1
;
- cbs->pl_
fbdev
_open();
- screen_buf = cbs->pl_
fbdev
_flip();
+ cbs->pl_
vout
_open();
+ screen_buf = cbs->pl_
vout
_flip();
return 0;
}
long GPUclose(void)
{
return 0;
}
long GPUclose(void)
{
- cbs->pl_
fbdev
_close();
+ cbs->pl_
vout
_close();
return 0;
}
void GPUrearmedCallbacks(const struct rearmed_cbs *cbs_)
{
cbs = cbs_;
return 0;
}
void GPUrearmedCallbacks(const struct rearmed_cbs *cbs_)
{
cbs = cbs_;
- gpu.frameskip.
enabled
= cbs->frameskip;
+ gpu.frameskip.
set
= cbs->frameskip;
gpu.frameskip.advice = &cbs->fskip_advice;
gpu.frameskip.advice = &cbs->fskip_advice;
- gpu.frameskip.active = gpu.frameskip.frame_ready = 0;
+ gpu.frameskip.active = 0;
+ gpu.frameskip.frame_ready = 1;
+ gpu.state.hcnt = cbs->gpu_hcnt;
}
// vim:shiftwidth=2:expandtab
}
// vim:shiftwidth=2:expandtab