X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfxvideo%2Fdraw_fb.c;h=f40063e6211a8ac16a4eaf7e0b1b3d6a00bda698;hp=a3f50e82f6bd1c2d397fdb26ebcb2b8585e30181;hb=7e44d49d2a65d6e45d6f99f72a8cccdb02654aae;hpb=e64dc4c54e96643522dc4b8c205d143c7d9b2f1d diff --git a/plugins/dfxvideo/draw_fb.c b/plugins/dfxvideo/draw_fb.c index a3f50e82..f40063e6 100644 --- 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. @@ -19,7 +19,7 @@ BOOL bCheckMask = FALSE; unsigned short sSetMask; unsigned long lSetMask; -static void blit(void) +static void blit(void *vout_buf) { int px = PSXDisplay.DisplayPosition.x & ~1; // XXX: align needed by bgr*_to_... int py = PSXDisplay.DisplayPosition.y; @@ -27,7 +27,7 @@ static void blit(void) 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; @@ -64,6 +64,7 @@ static void blit(void) void DoBufferSwap(void) { static int fbw, fbh, fb24bpp; + static void *vout_buf; if (PreviousPSXDisplay.DisplayMode.x == 0 || PreviousPSXDisplay.DisplayMode.y == 0) return; @@ -75,14 +76,14 @@ void DoBufferSwap(void) 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); - blit(); + blit(vout_buf); pcnt_end(PCNT_BLIT); - pl_fbdev_flip(); + vout_buf = rcbs->pl_vout_flip(); } void DoClearScreenBuffer(void) @@ -91,7 +92,7 @@ void DoClearScreenBuffer(void) unsigned long ulInitDisplay(void) { - if (pl_fbdev_open() != 0) + if (rcbs->pl_vout_open() != 0) return 0; return 1; /* ok */ @@ -99,5 +100,5 @@ unsigned long ulInitDisplay(void) void CloseDisplay(void) { - pl_fbdev_close(); + rcbs->pl_vout_close(); }