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
---
 libpcsxcore/plugins.h     | 4 ++--
 libpcsxcore/psxcounters.c | 9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'libpcsxcore')

diff --git a/libpcsxcore/plugins.h b/libpcsxcore/plugins.h
index 9125391..f7f6248 100644
--- a/libpcsxcore/plugins.h
+++ b/libpcsxcore/plugins.h
@@ -94,7 +94,7 @@ typedef long (CALLBACK* GPUfreeze)(uint32_t, GPUFreeze_t *);
 typedef long (CALLBACK* GPUgetScreenPic)(unsigned char *);
 typedef long (CALLBACK* GPUshowScreenPic)(unsigned char *);
 typedef void (CALLBACK* GPUclearDynarec)(void (CALLBACK *callback)(void));
-typedef void (CALLBACK* GPUvBlank)(int, uint32_t *, uint32_t *);
+typedef void (CALLBACK* GPUvBlank)(int);
 
 // GPU function pointers
 extern GPUupdateLace    GPU_updateLace;
@@ -119,7 +119,7 @@ extern GPUfreeze        GPU_freeze;
 extern GPUgetScreenPic  GPU_getScreenPic;
 extern GPUshowScreenPic GPU_showScreenPic;
 extern GPUclearDynarec  GPU_clearDynarec;
-extern GPUvBlank        GPU_vBlank;
+extern GPUvBlank        GPU_vBlank; // unused
 
 // CD-ROM Functions
 typedef long (CALLBACK* CDRinit)(void);
diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c
index e8d2796..6f82abd 100644
--- a/libpcsxcore/psxcounters.c
+++ b/libpcsxcore/psxcounters.c
@@ -71,12 +71,11 @@ static const s32 VerboseLevel     = VERBOSE_LEVEL;
 
 Rcnt rcnts[ CounterQuantity ];
 
-static u32 hSyncCount = 0;
+u32 hSyncCount = 0;
+u32 frame_counter = 0;
 static u32 spuSyncCount = 0;
 static u32 hsync_steps = 0;
-static u32 gpu_wants_hcnt = 0;
 static u32 base_cycle = 0;
-static u32 frame_counter = 0;
 
 u32 psxNextCounter = 0, psxNextsCounter = 0;
 
@@ -295,7 +294,6 @@ void psxRcntUpdate()
         // VSync irq.
         if( hSyncCount == VBlankStart[Config.PsxType] )
         {
-            GPU_vBlank( 1, &hSyncCount, &gpu_wants_hcnt );
             //if( !(HW_GPU_STATUS & PSXGPU_ILACE) ) // hmh
                 HW_GPU_STATUS |= PSXGPU_LCF;
 
@@ -309,7 +307,6 @@ void psxRcntUpdate()
             hSyncCount = 0;
             frame_counter++;
 
-            GPU_vBlank( 0, &hSyncCount, &gpu_wants_hcnt );
             setIrq( 0x01 );
 
             EmuUpdate();
@@ -328,8 +325,6 @@ void psxRcntUpdate()
             hsync_steps = next_vsync;
         if( next_lace && next_lace < hsync_steps )
             hsync_steps = next_lace;
-        if( gpu_wants_hcnt )
-            hsync_steps = 1;
 
         rcnts[3].cycleStart = cycle - leftover_cycles;
         if (Config.PsxType)
-- 
cgit v1.2.3