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
switch default gpu to gpu_neon
[pcsx_rearmed.git]
/
plugins
/
dfxvideo
/
draw_fb.c
diff --git
a/plugins/dfxvideo/draw_fb.c
b/plugins/dfxvideo/draw_fb.c
index
afe1d20
..
8814da8
100644
(file)
--- a/
plugins/dfxvideo/draw_fb.c
+++ b/
plugins/dfxvideo/draw_fb.c
@@
-1,5
+1,5
@@
/*
/*
- * (C) notaz, 2010
+ * (C) notaz, 2010
-2011
*
* This work is licensed under the terms of the GNU GPLv2 or later.
* See the COPYING file in the top-level directory.
*
* This work is licensed under the terms of the GNU GPLv2 or later.
* See the COPYING file in the top-level directory.
@@
-9,8
+9,9
@@
#include "gpu.h"
#include "gpu.h"
-#include "plugin_lib.h"
-#include "pcnt.h"
+#include "../../frontend/plugin_lib.h"
+#include "../../frontend/cspace.h"
+#include "../../frontend/pcnt.h"
// misc globals
long lLowerpart;
// misc globals
long lLowerpart;
@@
-18,29
+19,26
@@
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 *vout_buf)
{
{
- 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 pitch = PreviousPSXDisplay.DisplayMode.x;
unsigned short *srcs = psxVuw + py * 1024 + px;
int py = PSXDisplay.DisplayPosition.y;
int w = PreviousPSXDisplay.Range.x1;
int h = PreviousPSXDisplay.DisplayMode.y;
int pitch = PreviousPSXDisplay.DisplayMode.x;
unsigned short *srcs = psxVuw + py * 1024 + px;
- unsigned char *dest =
pl_fbdev
_buf;
+ unsigned char *dest =
vout
_buf;
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;
@@
-66,6
+64,7
@@
static void blit(void)
void DoBufferSwap(void)
{
static int fbw, fbh, fb24bpp;
void DoBufferSwap(void)
{
static int fbw, fbh, fb24bpp;
+ static void *vout_buf;
if (PreviousPSXDisplay.DisplayMode.x == 0 || PreviousPSXDisplay.DisplayMode.y == 0)
return;
if (PreviousPSXDisplay.DisplayMode.x == 0 || PreviousPSXDisplay.DisplayMode.y == 0)
return;
@@
-77,14
+76,17
@@
void DoBufferSwap(void)
fbw = PreviousPSXDisplay.DisplayMode.x;
fbh = PreviousPSXDisplay.DisplayMode.y;
fb24bpp = PSXDisplay.RGB24;
fbw = PreviousPSXDisplay.DisplayMode.x;
fbh = PreviousPSXDisplay.DisplayMode.y;
fb24bpp = PSXDisplay.RGB24;
-
pl_fbdev
_set_mode(fbw, fbh, fb24bpp ? 24 : 16);
+
vout_buf = rcbs->pl_vout
_set_mode(fbw, fbh, fb24bpp ? 24 : 16);
}
pcnt_start(PCNT_BLIT);
}
pcnt_start(PCNT_BLIT);
- blit();
+ if (rcbs->pl_vout_raw_flip != NULL)
+ rcbs->pl_vout_raw_flip(PSXDisplay.DisplayPosition.x, PSXDisplay.DisplayPosition.y);
+ else
+ blit(vout_buf);
pcnt_end(PCNT_BLIT);
pcnt_end(PCNT_BLIT);
-
pl_fbdev
_flip();
+
vout_buf = rcbs->pl_vout
_flip();
}
void DoClearScreenBuffer(void)
}
void DoClearScreenBuffer(void)
@@
-93,7
+95,7
@@
void DoClearScreenBuffer(void)
unsigned long ulInitDisplay(void)
{
unsigned long ulInitDisplay(void)
{
- if (
pl_fbdev
_open() != 0)
+ if (
rcbs->pl_vout
_open() != 0)
return 0;
return 1; /* ok */
return 0;
return 1; /* ok */
@@
-101,6
+103,5
@@
unsigned long ulInitDisplay(void)
void CloseDisplay(void)
{
void CloseDisplay(void)
{
-
pl_fbdev
_close();
+
rcbs->pl_vout
_close();
}
}
-