4 files changed, 20 insertions, 13 deletions

diff --git a/plugins/dfxvideo/draw_fb.c b/plugins/dfxvideo/draw_fb.c
index a3f50e8..f40063e 100644
--- 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.
@@ -19,7 +19,7 @@ BOOL           bCheckMask = FALSE;
 unsigned short sSetMask;
 unsigned long  lSetMask;
 
-static void blit(void)
+static void blit(void *vout_buf)
 {
  int px = PSXDisplay.DisplayPosition.x & ~1; // XXX: align needed by bgr*_to_...
  int py = PSXDisplay.DisplayPosition.y;
@@ -27,7 +27,7 @@ static void blit(void)
  int h = PreviousPSXDisplay.DisplayMode.y;
  int pitch = PreviousPSXDisplay.DisplayMode.x;
  unsigned short *srcs = psxVuw + py * 1024 + px;
- unsigned char *dest = pl_fbdev_buf;
+ unsigned char *dest = vout_buf;
 
  if (w <= 0)
    return;
@@ -64,6 +64,7 @@ static void blit(void)
 void DoBufferSwap(void)
 {
  static int fbw, fbh, fb24bpp;
+ static void *vout_buf;
 
  if (PreviousPSXDisplay.DisplayMode.x == 0 || PreviousPSXDisplay.DisplayMode.y == 0)
   return;
@@ -75,14 +76,14 @@ void DoBufferSwap(void)
   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();
+ blit(vout_buf);
  pcnt_end(PCNT_BLIT);
 
- pl_fbdev_flip();
+ vout_buf = rcbs->pl_vout_flip();
 }
 
 void DoClearScreenBuffer(void)
@@ -91,7 +92,7 @@ void DoClearScreenBuffer(void)
 
 unsigned long ulInitDisplay(void)
 {
- if (pl_fbdev_open() != 0)
+ if (rcbs->pl_vout_open() != 0)
   return 0;
 
  return 1; /* ok */
@@ -99,5 +100,5 @@ unsigned long ulInitDisplay(void)
 
 void CloseDisplay(void)
 {
- pl_fbdev_close();
+ rcbs->pl_vout_close();
 }
diff --git a/plugins/dfxvideo/gpu.c b/plugins/dfxvideo/gpu.c
index a2b4f92..6af6447 100644
--- a/plugins/dfxvideo/gpu.c
+++ b/plugins/dfxvideo/gpu.c
@@ -1139,6 +1139,8 @@ void CALLBACK GPUvBlank(int val)
 // rearmed thing
 #include "../../frontend/plugin_lib.h"
 
+const struct rearmed_cbs *rcbs;
+
 void GPUrearmedCallbacks(const struct rearmed_cbs *cbs)
 {
  // sync config
@@ -1150,4 +1152,5 @@ void GPUrearmedCallbacks(const struct rearmed_cbs *cbs)
 
  skip_advice = &cbs->fskip_advice;
  fps_skip = 100.0f;
+ rcbs = cbs;
 }
diff --git a/plugins/dfxvideo/gpu.h b/plugins/dfxvideo/gpu.h
index 6ac6d3e..9ee5f3e 100644
--- a/plugins/dfxvideo/gpu.h
+++ b/plugins/dfxvideo/gpu.h
@@ -314,4 +314,7 @@ void          DoClearFrontBuffer(void);
 unsigned long ulInitDisplay(void);
 void          CloseDisplay(void);
 
+struct rearmed_cbs;
+extern const struct rearmed_cbs *rcbs;
+
 #endif
diff --git a/plugins/gpu_unai/gpu.cpp b/plugins/gpu_unai/gpu.cpp
index 9b0a0dc..3515814 100644
--- a/plugins/gpu_unai/gpu.cpp
+++ b/plugins/gpu_unai/gpu.cpp
@@ -901,7 +901,7 @@ static void blit(void)
 		old_res_horz = w0;
 		old_res_vert = h1;
 		old_rgb24 = (s16)isRGB24;
-		screen_buf = cbs->pl_fbdev_set_mode(w0, h1, isRGB24 ? 24 : 16);
+		screen_buf = cbs->pl_vout_set_mode(w0, h1, isRGB24 ? 24 : 16);
 	}
 	dest = (u8 *)screen_buf;
 
@@ -927,7 +927,7 @@ static void blit(void)
 		}
 	}
 
-	screen_buf = cbs->pl_fbdev_flip();
+	screen_buf = cbs->pl_vout_flip();
 }
 
 void GPU_updateLace(void)
@@ -951,14 +951,14 @@ void GPU_updateLace(void)
 
 long GPUopen(unsigned long *, char *, char *)
 {
-	cbs->pl_fbdev_open();
-	screen_buf = cbs->pl_fbdev_flip();
+	cbs->pl_vout_open();
+	screen_buf = cbs->pl_vout_flip();
 	return 0;
 }
 
 long GPUclose(void)
 {
-	cbs->pl_fbdev_close();
+	cbs->pl_vout_close();
 	return 0;
 }