From d585d263937f4a5e10d86c93c9d056e4a8531a4f Mon Sep 17 00:00:00 2001
From: hrydgard <hrydgard@gmail.com>
Date: Fri, 26 Dec 2008 12:27:58 +0000
Subject: [PATCH] Move PixelShaderManager, ImageWrite to VideoCommon.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1686 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 .../VideoCommon}/Src/ImageWrite.cpp              |  2 --
 .../VideoCommon}/Src/ImageWrite.h                |  2 ++
 .../VideoCommon}/Src/PixelShaderManager.cpp      |  1 -
 .../VideoCommon}/Src/PixelShaderManager.h        |  0
 Source/Core/VideoCommon/Src/SConscript           |  2 ++
 Source/Core/VideoCommon/VideoCommon.vcproj       | 16 ++++++++++++++++
 .../Plugin_VideoOGL/Plugin_VideoOGL.vcproj       | 16 ----------------
 7 files changed, 20 insertions(+), 19 deletions(-)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoCommon}/Src/ImageWrite.cpp (99%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoCommon}/Src/ImageWrite.h (95%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoCommon}/Src/PixelShaderManager.cpp (99%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoCommon}/Src/PixelShaderManager.h (100%)

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ImageWrite.cpp b/Source/Core/VideoCommon/Src/ImageWrite.cpp
similarity index 99%
rename from Source/Plugins/Plugin_VideoOGL/Src/ImageWrite.cpp
rename to Source/Core/VideoCommon/Src/ImageWrite.cpp
index 987e2e6641..9d17d395bd 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ImageWrite.cpp
+++ b/Source/Core/VideoCommon/Src/ImageWrite.cpp
@@ -15,8 +15,6 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include "Globals.h"
-
 #include <stdio.h>
 #include <list>
 #include <vector>
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ImageWrite.h b/Source/Core/VideoCommon/Src/ImageWrite.h
similarity index 95%
rename from Source/Plugins/Plugin_VideoOGL/Src/ImageWrite.h
rename to Source/Core/VideoCommon/Src/ImageWrite.h
index 9d0e6880cb..30c4c7ceed 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ImageWrite.h
+++ b/Source/Core/VideoCommon/Src/ImageWrite.h
@@ -18,6 +18,8 @@
 #ifndef _IMAGEWRITE_H
 #define _IMAGEWRITE_H
 
+#include "Common.h"
+
 bool SaveTGA(const char* filename, int width, int height, void* pdata);
 bool SaveTexture(const char* filename, u32 textarget, u32 tex, int width, int height);
 bool SaveData(const char* filename, const char* pdata);
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.cpp b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
similarity index 99%
rename from Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.cpp
rename to Source/Core/VideoCommon/Src/PixelShaderManager.cpp
index 3bed787d6a..0b9f4ab7c9 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
@@ -21,7 +21,6 @@
 #include <cmath>
 
 #include "Statistics.h"
-#include "Config.h"
 
 #include "PixelShaderManager.h"
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.h b/Source/Core/VideoCommon/Src/PixelShaderManager.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.h
rename to Source/Core/VideoCommon/Src/PixelShaderManager.h
diff --git a/Source/Core/VideoCommon/Src/SConscript b/Source/Core/VideoCommon/Src/SConscript
index d098742857..cc19c260eb 100644
--- a/Source/Core/VideoCommon/Src/SConscript
+++ b/Source/Core/VideoCommon/Src/SConscript
@@ -11,7 +11,9 @@ files = [
 	"XFMemory.cpp",
 	"XFBConvert.cpp",
 	"PixelShader.cpp",
+	"PixelShaderManager.cpp",
 	"VertexShader.cpp",
+	"ImageWrite.cpp",
 	"Statistics.cpp",
 	"Fifo.cpp",
 	"VideoState.cpp",
diff --git a/Source/Core/VideoCommon/VideoCommon.vcproj b/Source/Core/VideoCommon/VideoCommon.vcproj
index 3261e68a5e..08a68aec10 100644
--- a/Source/Core/VideoCommon/VideoCommon.vcproj
+++ b/Source/Core/VideoCommon/VideoCommon.vcproj
@@ -471,6 +471,14 @@
 			RelativePath=".\Src\Fifo.h"
 			>
 		</File>
+		<File
+			RelativePath=".\Src\ImageWrite.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\Src\ImageWrite.h"
+			>
+		</File>
 		<File
 			RelativePath=".\Src\IndexGenerator.cpp"
 			>
@@ -499,6 +507,14 @@
 			RelativePath=".\Src\OpcodeDecoding.h"
 			>
 		</File>
+		<File
+			RelativePath=".\Src\PixelShaderManager.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\Src\PixelShaderManager.h"
+			>
+		</File>
 		<File
 			RelativePath=".\Src\Profiler.cpp"
 			>
diff --git a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj
index ab6ada4211..16d69afd52 100644
--- a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj
+++ b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj
@@ -812,14 +812,6 @@
 				RelativePath=".\Src\PixelShaderCache.h"
 				>
 			</File>
-			<File
-				RelativePath=".\Src\PixelShaderManager.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Src\PixelShaderManager.h"
-				>
-			</File>
 			<File
 				RelativePath=".\Src\rasterfont.cpp"
 				>
@@ -968,14 +960,6 @@
 				RelativePath=".\Src\Logging\Console.h"
 				>
 			</File>
-			<File
-				RelativePath=".\Src\ImageWrite.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Src\ImageWrite.h"
-				>
-			</File>
 			<File
 				RelativePath=".\Src\Logging\Logging.cpp"
 				>