ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(GX) Make gx_video more generic

This commit is contained in:
twinaphex 2014-06-07 03:50:47 +02:00
parent 4443e7320c
commit fcb563818b
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gx/gx_video.c
View File

@ -121,8 +121,8 @@ void gx_set_video_mode(void *data, unsigned fbWidth, unsigned lines)
(void)level; (void)level;
_CPU_ISR_Disable(level); _CPU_ISR_Disable(level);
VIDEO_SetBlack(true); VISetBlack(true);
VIDEO_Flush(); VIFlush();
viHeightMultiplier = 1; viHeightMultiplier = 1;
viWidth = 640; viWidth = 640;
#if defined(HW_RVL) #if defined(HW_RVL)
@ -242,19 +242,19 @@ void gx_set_video_mode(void *data, unsigned fbWidth, unsigned lines)
gx->double_strike = (modetype == VI_NON_INTERLACE); gx->double_strike = (modetype == VI_NON_INTERLACE);
gx->should_resize = true; gx->should_resize = true;
VIDEO_Configure(&gx_mode); VIConfigure(&gx_mode);
VIDEO_ClearFrameBuffer(&gx_mode, g_framebuf[0], COLOR_BLACK); VIDEO_ClearFrameBuffer(&gx_mode, g_framebuf[0], COLOR_BLACK);
VIDEO_ClearFrameBuffer(&gx_mode, g_framebuf[1], COLOR_BLACK); VIDEO_ClearFrameBuffer(&gx_mode, g_framebuf[1], COLOR_BLACK);
VIDEO_SetNextFramebuffer(g_framebuf[0]); VISetNextFrameBuffer(g_framebuf[0]);
VIDEO_SetPostRetraceCallback(retrace_callback); VISetPostRetraceCallback(retrace_callback);
VIDEO_SetBlack(false); VISetBlack(false);
VIDEO_Flush(); VIFlush();
GX_SetViewportJitter(0, 0, gx_mode.fbWidth, gx_mode.efbHeight, 0, 1, 1); GX_SetViewportJitter(0, 0, gx_mode.fbWidth, gx_mode.efbHeight, 0, 1, 1);
GX_SetDispCopySrc(0, 0, gx_mode.fbWidth, gx_mode.efbHeight); GX_SetDispCopySrc(0, 0, gx_mode.fbWidth, gx_mode.efbHeight);
f32 y_scale = GX_GetYScaleFactor(gx_mode.efbHeight, gx_mode.xfbHeight); f32 y_scale = GX_GetYScaleFactor(gx_mode.efbHeight, gx_mode.xfbHeight);
u16 xfbWidth = VIDEO_PadFramebufferWidth(gx_mode.fbWidth); u16 xfbWidth = VIPadFrameBufferWidth(gx_mode.fbWidth);
u16 xfbHeight = GX_SetDispCopyYScale(y_scale); u16 xfbHeight = GX_SetDispCopyYScale(y_scale);
(void)xfbHeight; (void)xfbHeight;
GX_SetDispCopyDst(xfbWidth, xfbHeight); GX_SetDispCopyDst(xfbWidth, xfbHeight);
@ -498,7 +498,7 @@ static void *gx_init(const video_info_t *video,
*input = gxinput ? &input_gx : NULL; *input = gxinput ? &input_gx : NULL;
*input_data = gxinput; *input_data = gxinput;
VIDEO_Init(); VIInit();
GX_Init(gx_fifo, sizeof(gx_fifo)); GX_Init(gx_fifo, sizeof(gx_fifo));
g_vsync = video->vsync; g_vsync = video->vsync;
@ -995,8 +995,8 @@ static bool gx_frame(void *data, const void *frame,
__GX_CopyDisp(__gx, g_framebuf[g_current_framebuf], clear_efb); __GX_CopyDisp(__gx, g_framebuf[g_current_framebuf], clear_efb);
__GX_Flush(__gx); __GX_Flush(__gx);
VIDEO_SetNextFramebuffer(g_framebuf[g_current_framebuf]); VISetNextFrameBuffer(g_framebuf[g_current_framebuf]);
VIDEO_Flush(); VIFlush();
g_extern.frame_count++; g_extern.frame_count++;
@ -1034,9 +1034,9 @@ static void gx_free(void *data)
GX_DrawDone(); GX_DrawDone();
GX_AbortFrame(); GX_AbortFrame();
GX_Flush(); GX_Flush();
VIDEO_SetBlack(true); VISetBlack(true);
VIDEO_Flush(); VIFlush();
VIDEO_WaitVSync(); VIWaitForRetrace();
free(data); free(data);
} }

11
gx/sdk_defines.h
View File

@ -3,7 +3,6 @@
#ifdef GEKKO #ifdef GEKKO
#ifndef OSInitMutex
#define OSThread lwp_t #define OSThread lwp_t
#define OSCond lwpq_t #define OSCond lwpq_t
#define OSThreadQueue lwpq_t #define OSThreadQueue lwpq_t
@ -22,7 +21,15 @@
#define OSJoinThread(thread, val) LWP_JoinThread(thread, val) #define OSJoinThread(thread, val) LWP_JoinThread(thread, val)
#define OSCreateThread(thread, func, intarg, ptrarg, stackbase, stacksize, priority, attrs) LWP_CreateThread(thread, func, ptrarg, stackbase, stacksize, priority) #define OSCreateThread(thread, func, intarg, ptrarg, stackbase, stacksize, priority, attrs) LWP_CreateThread(thread, func, ptrarg, stackbase, stacksize, priority)
#endif
#define VISetPostRetraceCallback(cb) VIDEO_SetPostRetraceCallback(cb)
#define VISetBlack(black) VIDEO_SetBlack(black)
#define VIFlush() VIDEO_Flush()
#define VISetNextFrameBuffer(fb) VIDEO_SetNextFramebuffer(fb)
#define VIWaitForRetrace() VIDEO_WaitVSync()
#define VIConfigure(rm) VIDEO_Configure(rm)
#define VIInit() VIDEO_Init()
#define VIPadFrameBufferWidth(width) VIDEO_PadFramebufferWidth(width)
#endif #endif