From 9675fe8108ea5aa1f80d4ef61a8196b748a291aa Mon Sep 17 00:00:00 2001
From: "Jake.Stine" <Jake.Stine@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Thu, 3 Dec 2009 15:49:12 +0000
Subject: [PATCH] Add a vsync callback to GSdx, managed by PCSX2.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2293 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 plugins/GSdx/GS.cpp   | 14 ++++++++++----
 plugins/GSdx/GSdx.def |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/plugins/GSdx/GS.cpp b/plugins/GSdx/GS.cpp
index e402b37611..e09529f96d 100644
--- a/plugins/GSdx/GS.cpp
+++ b/plugins/GSdx/GS.cpp
@@ -40,6 +40,7 @@ static void (*s_irq)() = NULL;
 static uint8* s_basemem = NULL;
 static int s_renderer = -1;
 static bool s_framelimit = true;
+static bool s_vsync = false;
 
 EXPORT_C_(uint32) PS2EgetLibType()
 {
@@ -201,6 +202,8 @@ static INT32 _GSopen(void* dsp, char* title, int renderer)
 
 	s_gs->SetRegsMem(s_basemem);
 	s_gs->SetIrqCallback(s_irq);
+	s_gs->SetVsync(s_vsync);
+	s_gs->SetFrameLimit(s_framelimit);
 
 	if( *(HWND*)dsp == NULL )
 	{
@@ -238,8 +241,6 @@ static INT32 _GSopen(void* dsp, char* title, int renderer)
 EXPORT_C_(INT32) GSopen2( void* dsp, INT32 flags )
 {
 	theApp.SetConfig("windowed", flags & 1);
-	//theApp.SetConfig("vsync", flags & 2);
-	//theApp.SetConfig("aspectratio", 0);		
 
 	int renderer = theApp.GetConfig("renderer", 0);
 	if( flags & 4 )
@@ -249,7 +250,6 @@ EXPORT_C_(INT32) GSopen2( void* dsp, INT32 flags )
 
 	INT32 retval = _GSopen( dsp, NULL, renderer );
 	s_gs->SetAspectRatio(0);		// PCSX2 manages the aspect ratios
-	s_gs->SetVsync(flags & 2);
 	
 	return retval;
 }
@@ -456,10 +456,16 @@ EXPORT_C GSsetFrameSkip(int frameskip)
 	s_gs->SetFrameSkip(frameskip);
 }
 
+EXPORT_C GSsetVsync(int enabled)
+{
+	s_vsync = !!enabled;
+	if( s_gs )
+		s_gs->SetVsync(s_vsync);
+}
 
 EXPORT_C GSsetFrameLimit(int limit)
 {
-	s_framelimit = limit != 0;
+	s_framelimit = !!limit;
 	if( s_gs )
 		s_gs->SetFrameLimit(s_framelimit);
 }
diff --git a/plugins/GSdx/GSdx.def b/plugins/GSdx/GSdx.def
index 1a7c5cdc2a..24a0caac35 100644
--- a/plugins/GSdx/GSdx.def
+++ b/plugins/GSdx/GSdx.def
@@ -34,6 +34,7 @@ EXPORTS
 	GSsetGameCRC		
 	GSsetFrameSkip
 	GSsetFrameLimit		
+	GSsetVsync
 	GSgetLastTag
 	GSReplay
 	GSBenchmark