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
frontend: use pld in blitters
[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
6b687b3
..
5b54bd1
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;
@@
-32,12
+32,12
@@
static void blit(void)
int y = gpu.screen.y;
int w = gpu.screen.w;
int h = gpu.screen.h;
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?
{
if ((gpu.status.reg ^ old_status) & ((7<<16)|(1<<21)) || h != old_h) // width|rgb24 change?
{
@@
-55,24
+55,27
@@
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);
}
}
}
}