diff options
author | notaz | 2012-11-02 03:07:05 +0200 |
---|---|---|
committer | notaz | 2012-11-02 03:07:05 +0200 |
commit | 2857d72e4ca743bba3cf55e298949e24d97dff02 (patch) | |
tree | 3742f3cd7cb1c10fc42fc4b581fff9c4ead3d9ce /plugins/dfxvideo/draw_pl.c | |
parent | 0e53ec55691229fee1cbb7c23b305be6a59431c4 (diff) | |
parent | bcb62992749a7f66e9a16a8022e090ff334c4424 (diff) | |
download | pcsx_rearmed-2857d72e4ca743bba3cf55e298949e24d97dff02.tar.gz pcsx_rearmed-2857d72e4ca743bba3cf55e298949e24d97dff02.tar.bz2 pcsx_rearmed-2857d72e4ca743bba3cf55e298949e24d97dff02.zip |
Merge branch 'enhancement'
Conflicts:
frontend/libretro.c
Diffstat (limited to 'plugins/dfxvideo/draw_pl.c')
-rw-r--r-- | plugins/dfxvideo/draw_pl.c | 45 |
1 files changed, 5 insertions, 40 deletions
diff --git a/plugins/dfxvideo/draw_pl.c b/plugins/dfxvideo/draw_pl.c index dffd52b..06a635d 100644 --- a/plugins/dfxvideo/draw_pl.c +++ b/plugins/dfxvideo/draw_pl.c @@ -19,56 +19,26 @@ BOOL bCheckMask = FALSE; unsigned short sSetMask; unsigned long lSetMask; -static void blit(void *vout_buf) +static void blit(void) { 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; - unsigned char *dest = vout_buf; if (w <= 0) return; - pitch *= (PSXDisplay.RGB24 && !rcbs->only_16bpp) ? 3 : 2; - // account for centering h -= PreviousPSXDisplay.Range.y0; - dest += PreviousPSXDisplay.Range.y0 / 2 * pitch; - dest += (PreviousPSXDisplay.Range.x0 & ~3) * 2; // must align here too.. - - if (PSXDisplay.RGB24) - { - if (!rcbs->only_16bpp) - { - for (; h-- > 0; dest += pitch, srcs += 1024) - { - bgr888_to_rgb888(dest, srcs, w * 3); - } - } - else - { - for (; h-- > 0; dest += pitch, srcs += 1024) - { - bgr888_to_rgb565(dest, srcs, w * 3); - } - } - } - else - { - for (; h-- > 0; dest += pitch, srcs += 1024) - { - bgr555_to_rgb565(dest, srcs, w * 2); - } - } + + rcbs->pl_vout_flip(srcs, 1024, PSXDisplay.RGB24, w, h); } void DoBufferSwap(void) { static int fbw, fbh, fb24bpp; - static void *vout_buf; if (PreviousPSXDisplay.DisplayMode.x == 0 || PreviousPSXDisplay.DisplayMode.y == 0) return; @@ -80,17 +50,12 @@ void DoBufferSwap(void) fbw = PreviousPSXDisplay.DisplayMode.x; fbh = PreviousPSXDisplay.DisplayMode.y; fb24bpp = PSXDisplay.RGB24; - vout_buf = rcbs->pl_vout_set_mode(fbw, fbh, fb24bpp ? 24 : 16); + rcbs->pl_vout_set_mode(fbw, fbh, fb24bpp ? 24 : 16); } pcnt_start(PCNT_BLIT); - if (rcbs->pl_vout_raw_flip != NULL) - rcbs->pl_vout_raw_flip(PSXDisplay.DisplayPosition.x, PSXDisplay.DisplayPosition.y); - else - blit(vout_buf); + blit(); pcnt_end(PCNT_BLIT); - - vout_buf = rcbs->pl_vout_flip(); } void DoClearScreenBuffer(void) |