#define _IN_DRAW
-#include "externals.h"
#include "gpu.h"
-#include "draw.h"
-#include "prim.h"
-#include "menu.h"
-#include "interp.h"
-#include "swap.h"
#include "plugin_lib.h"
+#include "arm_utils.h"
+#include "pcnt.h"
// misc globals
-int iResX;
-int iResY;
long lLowerpart;
-BOOL bIsFirstFrame = TRUE;
BOOL bCheckMask = FALSE;
-unsigned short sSetMask = 0;
-unsigned long lSetMask = 0;
-int iDesktopCol = 16;
-int iShowFPS = 0;
-int iWinSize;
-int iMaintainAspect = 0;
-int iUseNoStretchBlt = 0;
-int iFastFwd = 0;
-int iFVDisplay = 0;
-PSXPoint_t ptCursorPoint[8];
-unsigned short usCursorActive = 0;
-char * pCaptionText;
-
-#ifndef __arm__
-#define bgr555_to_rgb565 memcpy
-#define bgr888_to_rgb888 memcpy
-#endif
+unsigned short sSetMask;
+unsigned long lSetMask;
static void blit(void)
{
- extern void bgr555_to_rgb565(void *dst, void *src, int bytes);
- extern void bgr888_to_rgb888(void *dst, void *src, int bytes);
- int x = PSXDisplay.DisplayPosition.x;
- int y = PSXDisplay.DisplayPosition.y;
+ 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 pitch = PreviousPSXDisplay.DisplayMode.x;
- unsigned short *srcs = psxVuw + y * 1024 + x;
+ unsigned short *srcs = psxVuw + py * 1024 + px;
unsigned char *dest = pl_fbdev_buf;
if (w <= 0)
return;
- // TODO: clear border if centering
-
+#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 * 2; // XXX
+ dest += (PreviousPSXDisplay.Range.x0 & ~3) * 2; // must align here too..
if (PSXDisplay.RGB24)
{
}
}
-static int fbw, fbh, fb24bpp;
-
-#include "pcnt.h"
-
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;
- 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) {
- fbw = PSXDisplay.DisplayMode.x;
- fbh = PSXDisplay.DisplayMode.y;
+ fbw = PreviousPSXDisplay.DisplayMode.x;
+ fbh = PreviousPSXDisplay.DisplayMode.y;
fb24bpp = PSXDisplay.RGB24;
pl_fbdev_set_mode(fbw, fbh, fb24bpp ? 24 : 16);
}
+ pcnt_start(PCNT_BLIT);
blit();
- pl_fbdev_flip();
-
- pcnt_end(PCNT_ALL);
-
- if (++fps_counter == 60/6) {
- //printf("%2.1f\n", fps_cur);
- pcnt_print(fps_cur);
- fps_counter = 0;
- }
+ pcnt_end(PCNT_BLIT);
- pcnt_start(PCNT_ALL);
-}
-
-void DoClearScreenBuffer(void) // CLEAR DX BUFFER
-{
-}
-
-void DoClearFrontBuffer(void) // CLEAR DX BUFFER
-{
+ pl_fbdev_flip();
}
-static int initialize(void)
+void DoClearScreenBuffer(void)
{
- iDesktopCol=32;
-
- bUsingTWin=FALSE;
- bIsFirstFrame = FALSE; // done
-
- if(iShowFPS)
- {
- iShowFPS=0;
- ulKeybits|=KEY_SHOWFPS;
- szDispBuf[0]=0;
- BuildDispMenu(0);
- }
-
- return 0;
}
unsigned long ulInitDisplay(void)
{
- iShowFPS=1;
- initialize();
-
- if (pl_fbdev_init() != 0)
+ if (pl_fbdev_open() != 0)
return 0;
return 1; /* ok */
void CloseDisplay(void)
{
- CloseMenu();
- pl_fbdev_finish();
- //WriteConfig();
+ pl_fbdev_close();
}
-void CreatePic(unsigned char * pMem)
-{
-}
-
-void DestroyPic(void)
-{
-}
-
-void HandleKey(int keycode)
-{
-}