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
move layer control to plugin/plugin_lib
[pcsx_rearmed.git]
/
plugins
/
dfxvideo
/
draw_fb.c
diff --git
a/plugins/dfxvideo/draw_fb.c
b/plugins/dfxvideo/draw_fb.c
index
e251071
..
64657bb
100644
(file)
--- a/
plugins/dfxvideo/draw_fb.c
+++ b/
plugins/dfxvideo/draw_fb.c
@@
-16,6
+16,7
@@
#include "swap.h"
#include "plugin_lib.h"
#include "swap.h"
#include "plugin_lib.h"
+#include "pcnt.h"
// misc globals
int iResX;
// misc globals
int iResX;
@@
-38,30
+39,42
@@
char * pCaptionText;
#ifndef __arm__
#define bgr555_to_rgb565 memcpy
#ifndef __arm__
#define bgr555_to_rgb565 memcpy
+#define bgr888_to_rgb888 memcpy
#endif
static void blit(void)
{
extern void bgr555_to_rgb565(void *dst, void *src, int bytes);
#endif
static void blit(void)
{
extern void bgr555_to_rgb565(void *dst, void *src, int bytes);
- int x = PSXDisplay.DisplayPosition.x;
- int y = PSXDisplay.DisplayPosition.y;
+ extern void bgr888_to_rgb888(void *dst, void *src, int bytes);
+ int px = PSXDisplay.DisplayPosition.x & ~3; // XXX: align needed by bgr*_to_...
+ int py = PSXDisplay.DisplayPosition.y;
int w = PreviousPSXDisplay.Range.x1;
int h = PreviousPSXDisplay.DisplayMode.y;
int w = PreviousPSXDisplay.Range.x1;
int h = PreviousPSXDisplay.DisplayMode.y;
- int pitch = PreviousPSXDisplay.DisplayMode.x * 2;
+ int pitch = PreviousPSXDisplay.DisplayMode.x;
+ unsigned short *srcs = psxVuw + py * 1024 + px;
unsigned char *dest = pl_fbdev_buf;
if (w <= 0)
return;
unsigned char *dest = pl_fbdev_buf;
if (w <= 0)
return;
- // TODO: clear border if centering
+ // TODO: clear border if centering?
+
+ pitch *= PSXDisplay.RGB24 ? 3 : 2;
// account for centering
h -= PreviousPSXDisplay.Range.y0;
dest += PreviousPSXDisplay.Range.y0 / 2 * pitch;
// account for centering
h -= PreviousPSXDisplay.Range.y0;
dest += PreviousPSXDisplay.Range.y0 / 2 * pitch;
- dest +=
PreviousPSXDisplay.Range.x0 * 2; // XXX
+ dest +=
(PreviousPSXDisplay.Range.x0 & ~3) * 2; // must align here too..
+ if (PSXDisplay.RGB24)
+ {
+ for (; h-- > 0; dest += pitch, srcs += 1024)
+ {
+ bgr888_to_rgb888(dest, srcs, w * 3);
+ }
+ }
+ else
{
{
- unsigned short *srcs = psxVuw + y * 1024 + x;
for (; h-- > 0; dest += pitch, srcs += 1024)
{
bgr555_to_rgb565(dest, srcs, w * 2);
for (; h-- > 0; dest += pitch, srcs += 1024)
{
bgr555_to_rgb565(dest, srcs, w * 2);
@@
-69,36
+82,28
@@
static void blit(void)
}
}
}
}
-static int fbw, fbh, fb24bpp;
-
-#include "pcnt.h"
-
void DoBufferSwap(void)
{
void DoBufferSwap(void)
{
- static int fps_counter;
- if (PSXDisplay.DisplayMode.x == 0 || PSXDisplay.DisplayMode.y == 0)
+ static int fbw, fbh, fb24bpp;
+
+ if (PreviousPSXDisplay.DisplayMode.x == 0 || PreviousPSXDisplay.DisplayMode.y == 0)
return;
return;
- if (PSXDisplay.DisplayMode.x != fbw || PSXDisplay.DisplayMode.y != fbh
+ /* careful if rearranging this code, we try to set mode and flip
+ * to get the hardware apply both changes at the same time */
+ if (PreviousPSXDisplay.DisplayMode.x != fbw || PreviousPSXDisplay.DisplayMode.y != fbh
|| PSXDisplay.RGB24 != fb24bpp) {
|| PSXDisplay.RGB24 != fb24bpp) {
- fbw = PSXDisplay.DisplayMode.x;
- fbh = PSXDisplay.DisplayMode.y;
+ fbw = P
reviousP
SXDisplay.DisplayMode.x;
+ fbh = P
reviousP
SXDisplay.DisplayMode.y;
fb24bpp = PSXDisplay.RGB24;
pl_fbdev_set_mode(fbw, fbh, fb24bpp ? 24 : 16);
}
fb24bpp = PSXDisplay.RGB24;
pl_fbdev_set_mode(fbw, fbh, fb24bpp ? 24 : 16);
}
+ pcnt_start(PCNT_BLIT);
blit();
blit();
- p
l_fbdev_flip(
);
+ p
cnt_end(PCNT_BLIT
);
- pcnt_end(PCNT_ALL);
-
- if (++fps_counter == 60/6) {
- //printf("%2.1f\n", fps_cur);
- pcnt_print(fps_cur);
- fps_counter = 0;
- }
-
- pcnt_start(PCNT_ALL);
+ pl_fbdev_flip();
}
void DoClearScreenBuffer(void) // CLEAR DX BUFFER
}
void DoClearScreenBuffer(void) // CLEAR DX BUFFER
@@
-132,7
+137,7
@@
unsigned long ulInitDisplay(void)
iShowFPS=1;
initialize();
iShowFPS=1;
initialize();
- if (pl_fbdev_
init
() != 0)
+ if (pl_fbdev_
open
() != 0)
return 0;
return 1; /* ok */
return 0;
return 1; /* ok */
@@
-141,7
+146,7
@@
unsigned long ulInitDisplay(void)
void CloseDisplay(void)
{
CloseMenu();
void CloseDisplay(void)
{
CloseMenu();
- pl_fbdev_
finish
();
+ pl_fbdev_
close
();
//WriteConfig();
}
//WriteConfig();
}