psx_gpu: improve fills

[pcsx_rearmed.git] / plugins / dfxvideo / draw_fb.c

diff --git a/plugins/dfxvideo/draw_fb.c b/plugins/dfxvideo/draw_fb.c
index af05dd2..8814da8 100644 (file)
--- 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.
@@ -7,64 +7,43 @@
 
 #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 "pcnt.h"
+#include "../../frontend/plugin_lib.h"
+#include "../../frontend/cspace.h"
+#include "../../frontend/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)
+static void blit(void *vout_buf)
 {
- 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 & ~3; // XXX: align needed by bgr*_to_...
- int y = PSXDisplay.DisplayPosition.y;
+ 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 + y * 1024 + x;
- unsigned char *dest = pl_fbdev_buf;
+ unsigned short *srcs = psxVuw + py * 1024 + px;
+ unsigned char *dest = vout_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)
  {
@@ -84,59 +63,39 @@ static void blit(void)
 
 void DoBufferSwap(void)
 {
- static int fbw, fb24bpp;
+ static int fbw, fbh, fb24bpp;
+ static void *vout_buf;
 
- if (PSXDisplay.DisplayMode.x == 0 || PSXDisplay.DisplayMode.y == 0)
+ 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 (PSXDisplay.DisplayMode.x != fbw || PSXDisplay.RGB24 != fb24bpp) {
-  int fbh = PSXDisplay.DisplayMode.y;
-  fbw = PSXDisplay.DisplayMode.x;
+ if (PreviousPSXDisplay.DisplayMode.x != fbw || PreviousPSXDisplay.DisplayMode.y != fbh
+     || PSXDisplay.RGB24 != fb24bpp) {
+  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();
+ 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);
 
- pl_fbdev_flip();
-}
-
-void DoClearScreenBuffer(void)                         // CLEAR DX BUFFER
-{
+ vout_buf = rcbs->pl_vout_flip();
 }
 
-void DoClearFrontBuffer(void)                          // CLEAR DX BUFFER
+void DoClearScreenBuffer(void)
 {
 }
 
-static int initialize(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 (rcbs->pl_vout_open() != 0)
   return 0;
 
  return 1; /* ok */
@@ -144,19 +103,5 @@ unsigned long ulInitDisplay(void)
 
 void CloseDisplay(void)
 {
- CloseMenu();
- pl_fbdev_finish();
- //WriteConfig();
-}
-
-void CreatePic(unsigned char * pMem)
-{
-}
-
-void DestroyPic(void)
-{
-}
-
-void HandleKey(int keycode)
-{
+ rcbs->pl_vout_close();
 }