Explicit dependency on libvideo.

Back out r6960 for now. The wxGLCanvas may need to be persistent
and owned by DolphinWX in the rendertomain case.

Disambiguate SWVideoConfig.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6962 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp

@@ -54,7 +54,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "XFMemLoader.h"
 #include "BPMemLoader.h"
 #include "Statistics.h"
-#include "VideoConfig.h"
+#include "SWVideoConfig.h"
 
 
 namespace Clipper

Source/Plugins/Plugin_VideoSoftware/Src/CommandProcessor.cpp

@@ -38,7 +38,7 @@ u8* g_pVideoData;
 
 #else
 
-#include "VideoConfig.h"
+#include "SWVideoConfig.h"
 #include "OpcodeDecoding.h"
 #include "VideoCommon.h"
 extern u8* g_pVideoData;

Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.cpp

@@ -21,7 +21,7 @@
 #include "DebugUtil.h"
 #include "BPMemLoader.h"
 #include "TextureSampler.h"
-#include "VideoConfig.h"
+#include "SWVideoConfig.h"
 #include "EfbInterface.h"
 #include "Statistics.h"
 #include "HwRasterizer.h"

Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp

@@ -22,7 +22,7 @@
 #include "Renderer.h"
 #include "TextureEncoder.h"
 #include "Statistics.h"
-#include "VideoConfig.h"
+#include "SWVideoConfig.h"
 #include "DebugUtil.h"
 #include "HwRasterizer.h"
 #include "CommandProcessor.h"

Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp

@@ -16,7 +16,7 @@
 // http://code.google.com/p/dolphin-emu/
 
 #include "main.h"
-#include "VideoConfig.h"
+#include "SWVideoConfig.h"
 #include "IniFile.h"
 #include "Setup.h"
 
@@ -122,7 +122,8 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _twidth, int _theight
 	GLWin.glCanvas = new wxGLCanvas(GLWin.panel, wxID_ANY, NULL,
 		wxPoint(0, 0), wxSize(_twidth, _theight));
 	GLWin.glCanvas->Show(true);
-	GLWin.glCtxt = new wxGLContext(GLWin.glCanvas);
+	if (GLWin.glCtxt == NULL) // XXX dirty hack
+		GLWin.glCtxt = new wxGLContext(GLWin.glCanvas);
 
 #elif defined(_WIN32)
 	// Create rendering window in Windows
@@ -384,8 +385,8 @@ void OpenGL_Shutdown()
 {
 #if defined(USE_WX) && USE_WX
 	GLWin.glCanvas->Hide();
-	GLWin.glCanvas->Destroy();
-	delete GLWin.glCtxt;
+	// XXX GLWin.glCanvas->Destroy();
+	// XXX delete GLWin.glCtxt;
 #elif defined(_WIN32)
 	if (hRC)                                            // Do We Have A Rendering Context?
 	{

Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.h

@@ -20,7 +20,7 @@
 #define _GLINIT_H_
 
 #include <string>
-#include "VideoConfig.h"
+#include "SWVideoConfig.h"
 #include "pluginspecs_video.h"
 
 #ifdef _WIN32

Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp

@@ -24,7 +24,7 @@
 #include "XFMemLoader.h"
 #include "Tev.h"
 #include "Statistics.h"
-#include "VideoConfig.h"
+#include "SWVideoConfig.h"
 
 
 #define BLOCK_SIZE 2

Source/Plugins/Plugin_VideoSoftware/Src/SConscript

@@ -27,7 +27,7 @@ files = [
 	'TextureSampler.cpp',
 	'TransformUnit.cpp',
 	'VertexLoader.cpp',
-	'VideoConfig.cpp',
+	'SWVideoConfig.cpp',
 	'XFMemLoader.cpp',
 	]
 

Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp

@@ -17,7 +17,7 @@
 
 #include "FileUtil.h"
 #include "IniFile.h"
-#include "VideoConfig.h"
+#include "SWVideoConfig.h"
 
 SWVideoConfig g_SWVideoConfig;
 

Source/Plugins/Plugin_VideoSoftware/Src/Statistics.h

@@ -16,7 +16,7 @@
 // http://code.google.com/p/dolphin-emu/
 
 #include "CommonTypes.h"
-#include "VideoConfig.h"
+#include "SWVideoConfig.h"
 
 #ifndef _STATISTICS_H
 #define _STATISTICS_H

Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp

@@ -21,7 +21,7 @@
 #include "EfbInterface.h"
 #include "TextureSampler.h"
 #include "Statistics.h"
-#include "VideoConfig.h"
+#include "SWVideoConfig.h"
 #include "DebugUtil.h"
 
 #include <math.h>

Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.h

@@ -21,7 +21,7 @@
 #include <vector>
 #include <string>
 
-#include "VideoConfig.h"
+#include "SWVideoConfig.h"
 
 #include <wx/wx.h>
 #include <wx/textctrl.h>

Source/Plugins/Plugin_VideoSoftware/Src/Win32.cpp

@@ -23,7 +23,7 @@
 #include <wx/dialog.h>
 #include <wx/aboutdlg.h>
 
-#include "VideoConfig.h"
+#include "SWVideoConfig.h"
 #include "main.h"
 #include "Win32.h"
 

Source/Plugins/Plugin_VideoSoftware/Src/main.cpp

@@ -25,7 +25,7 @@
 
 #include "CommandProcessor.h"
 #include "OpcodeDecoder.h"
-#include "VideoConfig.h"
+#include "SWVideoConfig.h"
 #include "PixelEngine.h"
 #include "CommandProcessor.h"
 #include "BPMemLoader.h"