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
add guncon support
[pcsx_rearmed.git]
/
plugins
/
dfxvideo
/
draw_fb.c
diff --git
a/plugins/dfxvideo/draw_fb.c
b/plugins/dfxvideo/draw_fb.c
index
afe1d20
..
a3f50e8
100644
(file)
--- a/
plugins/dfxvideo/draw_fb.c
+++ b/
plugins/dfxvideo/draw_fb.c
@@
-9,8
+9,9
@@
#include "gpu.h"
#include "gpu.h"
-#include "plugin_lib.h"
-#include "pcnt.h"
+#include "../../frontend/plugin_lib.h"
+#include "../../frontend/arm_utils.h"
+#include "../../frontend/pcnt.h"
// misc globals
long lLowerpart;
// misc globals
long lLowerpart;
@@
-18,16
+19,9
@@
BOOL bCheckMask = FALSE;
unsigned short sSetMask;
unsigned long lSetMask;
unsigned short sSetMask;
unsigned long lSetMask;
-#ifndef __arm__
-#define bgr555_to_rgb565 memcpy
-#define bgr888_to_rgb888 memcpy
-#endif
-
static void blit(void)
{
static void blit(void)
{
- extern void bgr555_to_rgb565(void *dst, void *src, int bytes);
- extern void bgr888_to_rgb888(void *dst, void *src, int bytes);
- int px = PSXDisplay.DisplayPosition.x & ~3; // XXX: align needed by bgr*_to_...
+ int px = PSXDisplay.DisplayPosition.x & ~1; // XXX: align needed by bgr*_to_...
int py = PSXDisplay.DisplayPosition.y;
int w = PreviousPSXDisplay.Range.x1;
int h = PreviousPSXDisplay.DisplayMode.y;
int py = PSXDisplay.DisplayPosition.y;
int w = PreviousPSXDisplay.Range.x1;
int h = PreviousPSXDisplay.DisplayMode.y;
@@
-38,9
+32,13
@@
static void blit(void)
if (w <= 0)
return;
if (w <= 0)
return;
- // TODO: clear border if centering?
-
+#ifndef MAEMO
pitch *= PSXDisplay.RGB24 ? 3 : 2;
pitch *= PSXDisplay.RGB24 ? 3 : 2;
+#else
+ // n900 doesn't do rgb24 for some reason
+ pitch *= 2;
+ #define bgr888_to_rgb888 bgr888_to_rgb565
+#endif
// account for centering
h -= PreviousPSXDisplay.Range.y0;
// account for centering
h -= PreviousPSXDisplay.Range.y0;
@@
-103,4
+101,3
@@
void CloseDisplay(void)
{
pl_fbdev_close();
}
{
pl_fbdev_close();
}
-