From e64dc4c54e96643522dc4b8c205d143c7d9b2f1d Mon Sep 17 00:00:00 2001
From: notaz
Date: Sat, 18 Jun 2011 01:23:27 +0300
Subject: dfxvideo: decouple from main emu

---
 plugins/dfxvideo/draw_fb.c |  7 +++----
 plugins/dfxvideo/gpu.c     | 19 ++++++++++++++++++-
 plugins/gpu_unai/gpu.cpp   |  2 +-
 3 files changed, 22 insertions(+), 6 deletions(-)

(limited to 'plugins')

diff --git a/plugins/dfxvideo/draw_fb.c b/plugins/dfxvideo/draw_fb.c
index b560813..a3f50e8 100644
--- a/plugins/dfxvideo/draw_fb.c
+++ b/plugins/dfxvideo/draw_fb.c
@@ -9,9 +9,9 @@
 
 #include "gpu.h"
 
-#include "plugin_lib.h"
-#include "arm_utils.h"
-#include "pcnt.h"
+#include "../../frontend/plugin_lib.h"
+#include "../../frontend/arm_utils.h"
+#include "../../frontend/pcnt.h"
 
 // misc globals
 long           lLowerpart;
@@ -101,4 +101,3 @@ void CloseDisplay(void)
 {
  pl_fbdev_close();
 }
-
diff --git a/plugins/dfxvideo/gpu.c b/plugins/dfxvideo/gpu.c
index b384526..9a614de 100644
--- a/plugins/dfxvideo/gpu.c
+++ b/plugins/dfxvideo/gpu.c
@@ -62,6 +62,7 @@ BOOL              bDoLazyUpdate=FALSE;
 uint32_t          lGPUInfoVals[16];
 static int        iFakePrimBusy=0;
 static uint32_t   vBlank=0;
+static const int  *skip_advice;
 
 ////////////////////////////////////////////////////////////////////////
 // some misc external display funcs
@@ -232,7 +233,8 @@ static void decideSkip(void)
 
  if(dwActFixes&0xa0)                                   // -> pc fps calculation fix/old skipping fix
   {
-   if((fps_skip < fFrameRateHz) && !bSkipNextFrame)    // -> skip max one in a row
+   int skip = (skip_advice && *skip_advice) || fps_skip < fFrameRateHz;
+   if(skip && !bSkipNextFrame)                         // -> skip max one in a row
        {bSkipNextFrame = TRUE; fps_skip=fFrameRateHz;}
    else bSkipNextFrame = FALSE;
   }
@@ -1132,3 +1134,18 @@ void CALLBACK GPUvBlank(int val)
  vBlank=val?0x80000000:0;
 }
 
+// rearmed thing
+#include "../../frontend/plugin_lib.h"
+
+void GPUrearmedCallbacks(const struct rearmed_cbs *cbs)
+{
+ // sync config
+ UseFrameSkip = cbs->frameskip;
+ iUseDither = cbs->gpu_peops.iUseDither;
+ dwActFixes = cbs->gpu_peops.dwActFixes;
+ fFrameRateHz = cbs->gpu_peops.fFrameRateHz;
+ dwFrameRateTicks = cbs->gpu_peops.dwFrameRateTicks;
+
+ skip_advice = &cbs->fskip_advice;
+ fps_skip = 100.0f;
+}
diff --git a/plugins/gpu_unai/gpu.cpp b/plugins/gpu_unai/gpu.cpp
index 0ef8f51..808c891 100644
--- a/plugins/gpu_unai/gpu.cpp
+++ b/plugins/gpu_unai/gpu.cpp
@@ -938,7 +938,7 @@ void GPU_updateLace(void)
 		blit();
 
 		fb_dirty = false;
-		if (*cbs->fskip_option)
+		if (cbs->fskip_advice)
 			isSkip = true;
 	}
 	else
-- 
cgit v1.2.3