From a7025c15913d98bbeafe61df5e596c1dc965de1d Mon Sep 17 00:00:00 2001
From: nakeee <nakeee@gmail.com>
Date: Thu, 29 Jan 2009 11:12:53 +0000
Subject: [PATCH] testgl=1 compile fix

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2036 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 SConstruct                                   |  1 -
 Source/Plugins/Plugin_DSP_HLE/Src/SConscript |  1 -
 Source/Plugins/Plugin_VideoOGL/Src/nmain.cpp | 22 ++++++++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/SConstruct b/SConstruct
index 046c7c31a6..87b4a4793c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -66,7 +66,6 @@ dirs = [
     'Source/Plugins/Plugin_VideoOGL/Src',
     'Source/Plugins/Plugin_DSP_HLE/Src',
     'Source/Plugins/Plugin_DSP_LLE/Src',
-    'Source/Plugins/Plugin_DSP_NULL/Src',
     'Source/Plugins/Plugin_PadSimple/Src',
     'Source/Plugins/Plugin_PadSimpleEvnt/Src',
     'Source/Plugins/Plugin_nJoy_SDL/Src',
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/SConscript b/Source/Plugins/Plugin_DSP_HLE/Src/SConscript
index 87a0255f7c..1bd0596d56 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/SConscript
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/SConscript
@@ -12,7 +12,6 @@ files = [
 	'Config.cpp',
 	'Globals.cpp',
 	'PCHW/AOSoundStream.cpp',
-	'PCHW/NullSoundStream.cpp',
 	'PCHW/Mixer.cpp',
 	'Debugger/File.cpp',
 	'UCodes/UCode_AX.cpp',
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/nmain.cpp b/Source/Plugins/Plugin_VideoOGL/Src/nmain.cpp
index b884f57ac2..a3d819c816 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/nmain.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/nmain.cpp
@@ -254,3 +254,25 @@ void Video_AddMessage(const char* pstr, u32 milliseconds)
 {
 	Renderer::AddMessage(pstr,milliseconds);
 }
+
+void Video_UpdateXFB(u8* _pXFB, u32 _dwWidth, u32 _dwHeight, s32 _dwYOffset, bool scheduling)
+{
+	if(g_Config.bUseXFB && XFB_isInit())
+	{
+		if (scheduling) // from CPU in DC without fifo&CP (some 2D homebrews)
+		{
+			XFB_SetUpdateArgs(_pXFB, _dwWidth, _dwHeight, _dwYOffset);
+			g_XFBUpdateRequested = TRUE;
+		}
+		else
+		{
+			if (_pXFB) // from CPU in SC mode
+				XFB_Draw(_pXFB, _dwWidth, _dwHeight, _dwYOffset);
+			else // from GP in DC without fifo&CP (some 2D homebrews)
+			{
+				XFB_Draw();
+				g_XFBUpdateRequested = FALSE;
+			}
+		}
+	}
+}