From 24de2dd4dbdd50e44c91c40ebbc7d59ee1c0ac9b Mon Sep 17 00:00:00 2001
From: notaz
Date: Mon, 5 Dec 2011 00:11:01 +0200
Subject: remove gpu vblank callbacks

we do it in core now
---
 plugins/dfxvideo/gpu.c     |  8 +-------
 plugins/gpu_neon/gpu.c     | 21 +--------------------
 plugins/gpu_neon/gpu.h     |  1 -
 plugins/gpu_neon/vout_fb.c |  1 +
 4 files changed, 3 insertions(+), 28 deletions(-)

(limited to 'plugins')

diff --git a/plugins/dfxvideo/gpu.c b/plugins/dfxvideo/gpu.c
index f9a49bb..9fa08fe 100644
--- a/plugins/dfxvideo/gpu.c
+++ b/plugins/dfxvideo/gpu.c
@@ -60,7 +60,6 @@ long              lSelectedSlot=0;
 BOOL              bDoLazyUpdate=FALSE;
 uint32_t          lGPUInfoVals[16];
 static int        iFakePrimBusy=0;
-static uint32_t   vBlank=0;
 static const int  *skip_advice;
 
 ////////////////////////////////////////////////////////////////////////
@@ -472,7 +471,7 @@ uint32_t CALLBACK GPUreadStatus(void)             // READ STATUS
      GPUIsReadyForCommands;
     }
   }
- return lGPUstatusRet | vBlank;
+ return lGPUstatusRet;
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -1129,11 +1128,6 @@ long CALLBACK GPUfreeze(uint32_t ulGetFreezeData,GPUFreeze_t * pF)
  return 1;
 }
 
-void CALLBACK GPUvBlank(int val)
-{
- vBlank=val?0x80000000:0;
-}
-
 // rearmed thing
 #include "../../frontend/plugin_lib.h"
 
diff --git a/plugins/gpu_neon/gpu.c b/plugins/gpu_neon/gpu.c
index c275d83..12417e6 100644
--- a/plugins/gpu_neon/gpu.c
+++ b/plugins/gpu_neon/gpu.c
@@ -94,7 +94,6 @@ long GPUinit(void)
   ret  = vout_init();
   ret |= renderer_init();
 
-  gpu.lcf_hc = &gpu.zero;
   gpu.state.frame_count = 0;
   gpu.state.hcnt = &gpu.zero;
   do_reset();
@@ -463,7 +462,7 @@ uint32_t GPUreadStatus(void)
   if (unlikely(gpu.cmd_len > 0))
     flush_cmd_buffer();
 
-  ret = gpu.status.reg | (*gpu.lcf_hc << 31);
+  ret = gpu.status.reg;
   log_io("gpu_read_status %08x\n", ret);
   return ret;
 }
@@ -506,22 +505,4 @@ long GPUfreeze(uint32_t type, GPUFreeze_t *freeze)
   return 1;
 }
 
-void GPUvBlank(int val, uint32_t *hcnt)
-{
-  gpu.lcf_hc = &gpu.zero;
-  if (gpu.status.interlace) {
-    if (val)
-      gpu.status.lcf ^= 1;
-  }
-  else {
-    gpu.status.lcf = 0;
-    if (!val)
-      gpu.lcf_hc = hcnt;
-  }
-  if (!val)
-    gpu.state.frame_count++;
-
-  gpu.state.hcnt = hcnt;
-}
-
 // vim:shiftwidth=2:expandtab
diff --git a/plugins/gpu_neon/gpu.h b/plugins/gpu_neon/gpu.h
index c3e13bb..5ededcb 100644
--- a/plugins/gpu_neon/gpu.h
+++ b/plugins/gpu_neon/gpu.h
@@ -61,7 +61,6 @@ struct psx_gpu {
     int offset;
   } dma;
   int cmd_len;
-  const uint32_t *lcf_hc;
   uint32_t zero;
   struct {
     uint32_t fb_dirty:1;
diff --git a/plugins/gpu_neon/vout_fb.c b/plugins/gpu_neon/vout_fb.c
index 7da4ae2..344c755 100644
--- a/plugins/gpu_neon/vout_fb.c
+++ b/plugins/gpu_neon/vout_fb.c
@@ -125,6 +125,7 @@ void GPUrearmedCallbacks(const struct rearmed_cbs *cbs_)
   gpu.frameskip.advice = &cbs->fskip_advice;
   gpu.frameskip.active = 0;
   gpu.frameskip.frame_ready = 1;
+  gpu.state.hcnt = cbs->gpu_hcnt;
 }
 
 // vim:shiftwidth=2:expandtab
-- 
cgit v1.2.3