From 1f219c7b8a6f2b7a70f595ccdfe419ea034c9411 Mon Sep 17 00:00:00 2001 From: notaz Date: Sat, 21 Apr 2012 23:21:13 +0300 Subject: rename vout_fb to vout_pl that code outputs through plugin_lib, which is not necessary fb. --- Makefile | 2 +- plugins/dfxvideo/Makefile | 2 +- plugins/dfxvideo/draw_fb.c | 107 --------------------------------------- plugins/dfxvideo/draw_pl.c | 107 +++++++++++++++++++++++++++++++++++++++ plugins/gpulib/Makefile | 2 +- plugins/gpulib/vout_fb.c | 121 -------------------------------------------- plugins/gpulib/vout_pl.c | 122 +++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 232 insertions(+), 231 deletions(-) delete mode 100644 plugins/dfxvideo/draw_fb.c create mode 100644 plugins/dfxvideo/draw_pl.c delete mode 100644 plugins/gpulib/vout_fb.c create mode 100644 plugins/gpulib/vout_pl.c diff --git a/Makefile b/Makefile index 5b5ffe1..cdc1a74 100644 --- a/Makefile +++ b/Makefile @@ -99,7 +99,7 @@ LDLIBS += -lX11 `sdl-config --libs` OBJS += plugins/gpulib/vout_sdl.o plugins/gpulib/vout_sdl.o: CFLAGS += `sdl-config --cflags` else -OBJS += plugins/gpulib/vout_fb.o +OBJS += plugins/gpulib/vout_pl.o endif # cdrcimg diff --git a/plugins/dfxvideo/Makefile b/plugins/dfxvideo/Makefile index b6cc756..a5ca5f3 100644 --- a/plugins/dfxvideo/Makefile +++ b/plugins/dfxvideo/Makefile @@ -9,7 +9,7 @@ SRC_STANDALONE += gpu.c SRC_GPULIB += gpulib_if.c ifeq "$(ARCH)" "arm" -SRC_STANDALONE += draw_fb.c +SRC_STANDALONE += draw_pl.c else SRC_STANDALONE += draw.c LDLIBS_STANDALONE += -lX11 -lXv diff --git a/plugins/dfxvideo/draw_fb.c b/plugins/dfxvideo/draw_fb.c deleted file mode 100644 index 22351a4..0000000 --- a/plugins/dfxvideo/draw_fb.c +++ /dev/null @@ -1,107 +0,0 @@ -/* - * (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. - */ - -#define _IN_DRAW - -#include "gpu.h" - -#include "../gpulib/cspace.h" -#include "../../frontend/plugin_lib.h" -#include "../../frontend/pcnt.h" - -// misc globals -long lLowerpart; -BOOL bCheckMask = FALSE; -unsigned short sSetMask; -unsigned long lSetMask; - -static void blit(void *vout_buf) -{ - 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; - -#ifndef MAEMO - 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; - dest += PreviousPSXDisplay.Range.y0 / 2 * pitch; - 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 - { - for (; h-- > 0; dest += pitch, srcs += 1024) - { - bgr555_to_rgb565(dest, srcs, w * 2); - } - } -} - -void DoBufferSwap(void) -{ - static int fbw, fbh, fb24bpp; - static void *vout_buf; - - if (PreviousPSXDisplay.DisplayMode.x == 0 || PreviousPSXDisplay.DisplayMode.y == 0) - return; - - /* 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) { - fbw = PreviousPSXDisplay.DisplayMode.x; - fbh = PreviousPSXDisplay.DisplayMode.y; - fb24bpp = PSXDisplay.RGB24; - vout_buf = 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); - pcnt_end(PCNT_BLIT); - - vout_buf = rcbs->pl_vout_flip(); -} - -void DoClearScreenBuffer(void) -{ -} - -unsigned long ulInitDisplay(void) -{ - if (rcbs->pl_vout_open() != 0) - return 0; - - return 1; /* ok */ -} - -void CloseDisplay(void) -{ - rcbs->pl_vout_close(); -} diff --git a/plugins/dfxvideo/draw_pl.c b/plugins/dfxvideo/draw_pl.c new file mode 100644 index 0000000..22351a4 --- /dev/null +++ b/plugins/dfxvideo/draw_pl.c @@ -0,0 +1,107 @@ +/* + * (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. + */ + +#define _IN_DRAW + +#include "gpu.h" + +#include "../gpulib/cspace.h" +#include "../../frontend/plugin_lib.h" +#include "../../frontend/pcnt.h" + +// misc globals +long lLowerpart; +BOOL bCheckMask = FALSE; +unsigned short sSetMask; +unsigned long lSetMask; + +static void blit(void *vout_buf) +{ + 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; + +#ifndef MAEMO + 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; + dest += PreviousPSXDisplay.Range.y0 / 2 * pitch; + 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 + { + for (; h-- > 0; dest += pitch, srcs += 1024) + { + bgr555_to_rgb565(dest, srcs, w * 2); + } + } +} + +void DoBufferSwap(void) +{ + static int fbw, fbh, fb24bpp; + static void *vout_buf; + + if (PreviousPSXDisplay.DisplayMode.x == 0 || PreviousPSXDisplay.DisplayMode.y == 0) + return; + + /* 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) { + fbw = PreviousPSXDisplay.DisplayMode.x; + fbh = PreviousPSXDisplay.DisplayMode.y; + fb24bpp = PSXDisplay.RGB24; + vout_buf = 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); + pcnt_end(PCNT_BLIT); + + vout_buf = rcbs->pl_vout_flip(); +} + +void DoClearScreenBuffer(void) +{ +} + +unsigned long ulInitDisplay(void) +{ + if (rcbs->pl_vout_open() != 0) + return 0; + + return 1; /* ok */ +} + +void CloseDisplay(void) +{ + rcbs->pl_vout_close(); +} diff --git a/plugins/gpulib/Makefile b/plugins/gpulib/Makefile index 9ed992f..43f0d2b 100644 --- a/plugins/gpulib/Makefile +++ b/plugins/gpulib/Makefile @@ -13,7 +13,7 @@ OBJS += cspace_neon.o else OBJS += cspace.o endif -OBJS += vout_fb.o +OBJS += vout_pl.o EXT = a else CFLAGS += `sdl-config --cflags` diff --git a/plugins/gpulib/vout_fb.c b/plugins/gpulib/vout_fb.c deleted file mode 100644 index 021efa7..0000000 --- a/plugins/gpulib/vout_fb.c +++ /dev/null @@ -1,121 +0,0 @@ -/* - * (C) Gražvydas "notaz" Ignotas, 2011 - * - * This work is licensed under the terms of any of these licenses - * (at your option): - * - GNU GPL, version 2 or later. - * - GNU LGPL, version 2.1 or later. - * See the COPYING file in the top-level directory. - */ - -#include "gpu.h" -#include "cspace.h" -#include "../../frontend/plugin_lib.h" - -static const struct rearmed_cbs *cbs; -static void *screen_buf; - -int vout_init(void) -{ - return 0; -} - -int vout_finish(void) -{ - return 0; -} - -static void check_mode_change(void) -{ - static uint32_t old_status; - static int old_h; - - // width|rgb24 change? - if ((gpu.status.reg ^ old_status) & ((7<<16)|(1<<21)) || gpu.screen.h != old_h) - { - old_status = gpu.status.reg; - old_h = gpu.screen.h; - screen_buf = cbs->pl_vout_set_mode(gpu.screen.hres, - gpu.screen.h, gpu.status.rgb24 ? 24 : 16); - } -} - -static void blit(void) -{ - int x = gpu.screen.x & ~1; // alignment needed by blitter - int y = gpu.screen.y; - int w = gpu.screen.w; - int h = gpu.screen.h; - uint16_t *vram = gpu.vram; - int stride = gpu.screen.hres; - int fb_offs, doffs; - uint8_t *dest; - - fb_offs = y * 1024 + x; - dest = (uint8_t *)screen_buf; - - // only do centering, at least for now - doffs = (stride - w) / 2 & ~1; - - if (gpu.status.rgb24) - { -#ifndef MAEMO - dest += (doffs / 8) * 24; - for (; h-- > 0; dest += stride * 3, fb_offs += 1024) - { - fb_offs &= 1024*512-1; - bgr888_to_rgb888(dest, vram + fb_offs, w * 3); - } -#else - dest += doffs * 2; - for (; h-- > 0; dest += stride * 2, fb_offs += 1024) - { - fb_offs &= 1024*512-1; - bgr888_to_rgb565(dest, vram + fb_offs, w * 3); - } -#endif - } - else - { - dest += doffs * 2; - for (; h-- > 0; dest += stride * 2, fb_offs += 1024) - { - fb_offs &= 1024*512-1; - bgr555_to_rgb565(dest, vram + fb_offs, w * 2); - } - } - - screen_buf = cbs->pl_vout_flip(); -} - -void vout_update(void) -{ - check_mode_change(); - if (cbs->pl_vout_raw_flip) - cbs->pl_vout_raw_flip(gpu.screen.x, gpu.screen.y); - else - blit(); -} - -long GPUopen(void **unused) -{ - gpu.frameskip.active = 0; - gpu.frameskip.frame_ready = 1; - - cbs->pl_vout_open(); - screen_buf = cbs->pl_vout_flip(); - return 0; -} - -long GPUclose(void) -{ - cbs->pl_vout_close(); - return 0; -} - -void vout_set_config(const struct rearmed_cbs *cbs_) -{ - cbs = cbs_; -} - -// vim:shiftwidth=2:expandtab diff --git a/plugins/gpulib/vout_pl.c b/plugins/gpulib/vout_pl.c new file mode 100644 index 0000000..91de057 --- /dev/null +++ b/plugins/gpulib/vout_pl.c @@ -0,0 +1,122 @@ +/* + * video output handling using plugin_lib + * (C) Gražvydas "notaz" Ignotas, 2011 + * + * This work is licensed under the terms of any of these licenses + * (at your option): + * - GNU GPL, version 2 or later. + * - GNU LGPL, version 2.1 or later. + * See the COPYING file in the top-level directory. + */ + +#include "gpu.h" +#include "cspace.h" +#include "../../frontend/plugin_lib.h" + +static const struct rearmed_cbs *cbs; +static void *screen_buf; + +int vout_init(void) +{ + return 0; +} + +int vout_finish(void) +{ + return 0; +} + +static void check_mode_change(void) +{ + static uint32_t old_status; + static int old_h; + + // width|rgb24 change? + if ((gpu.status.reg ^ old_status) & ((7<<16)|(1<<21)) || gpu.screen.h != old_h) + { + old_status = gpu.status.reg; + old_h = gpu.screen.h; + screen_buf = cbs->pl_vout_set_mode(gpu.screen.hres, + gpu.screen.h, gpu.status.rgb24 ? 24 : 16); + } +} + +static void blit(void) +{ + int x = gpu.screen.x & ~1; // alignment needed by blitter + int y = gpu.screen.y; + int w = gpu.screen.w; + int h = gpu.screen.h; + uint16_t *vram = gpu.vram; + int stride = gpu.screen.hres; + int fb_offs, doffs; + uint8_t *dest; + + fb_offs = y * 1024 + x; + dest = (uint8_t *)screen_buf; + + // only do centering, at least for now + doffs = (stride - w) / 2 & ~1; + + if (gpu.status.rgb24) + { +#ifndef MAEMO + dest += (doffs / 8) * 24; + for (; h-- > 0; dest += stride * 3, fb_offs += 1024) + { + fb_offs &= 1024*512-1; + bgr888_to_rgb888(dest, vram + fb_offs, w * 3); + } +#else + dest += doffs * 2; + for (; h-- > 0; dest += stride * 2, fb_offs += 1024) + { + fb_offs &= 1024*512-1; + bgr888_to_rgb565(dest, vram + fb_offs, w * 3); + } +#endif + } + else + { + dest += doffs * 2; + for (; h-- > 0; dest += stride * 2, fb_offs += 1024) + { + fb_offs &= 1024*512-1; + bgr555_to_rgb565(dest, vram + fb_offs, w * 2); + } + } + + screen_buf = cbs->pl_vout_flip(); +} + +void vout_update(void) +{ + check_mode_change(); + if (cbs->pl_vout_raw_flip) + cbs->pl_vout_raw_flip(gpu.screen.x, gpu.screen.y); + else + blit(); +} + +long GPUopen(void **unused) +{ + gpu.frameskip.active = 0; + gpu.frameskip.frame_ready = 1; + + cbs->pl_vout_open(); + screen_buf = cbs->pl_vout_flip(); + return 0; +} + +long GPUclose(void) +{ + cbs->pl_vout_close(); + return 0; +} + +void vout_set_config(const struct rearmed_cbs *cbs_) +{ + cbs = cbs_; +} + +// vim:shiftwidth=2:expandtab -- cgit v1.2.3