GL Vertex loader moved to VideoCommon.

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

15 files changed, 55 insertions, 115 deletions

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp b/Source/Core/VideoCommon/Src/VertexLoader.cpp
index 8efe459a6d..220be31816 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp
+++ b/Source/Core/VideoCommon/Src/VertexLoader.cpp
@@ -15,12 +15,10 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include "Globals.h"
-
 #include <assert.h>
 
 #include "Common.h"
-#include "Config.h"
+#include "VideoCommon.h"
 #include "Profiler.h"
 #include "MemoryUtil.h"
 #include "StringUtil.h"
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.h b/Source/Core/VideoCommon/Src/VertexLoader.h
index 34ead98b88..34ead98b88 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.h
+++ b/Source/Core/VideoCommon/Src/VertexLoader.h
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_Color.cpp b/Source/Core/VideoCommon/Src/VertexLoader_Color.cpp
index ebb1c62dcc..ebb1c62dcc 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_Color.cpp
+++ b/Source/Core/VideoCommon/Src/VertexLoader_Color.cpp
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_Color.h b/Source/Core/VideoCommon/Src/VertexLoader_Color.h
index 09e5370429..09e5370429 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_Color.h
+++ b/Source/Core/VideoCommon/Src/VertexLoader_Color.h
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_Normal.cpp b/Source/Core/VideoCommon/Src/VertexLoader_Normal.cpp
index da2f990594..da2f990594 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_Normal.cpp
+++ b/Source/Core/VideoCommon/Src/VertexLoader_Normal.cpp
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_Normal.h b/Source/Core/VideoCommon/Src/VertexLoader_Normal.h
index 0ef69f1469..0ef69f1469 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_Normal.h
+++ b/Source/Core/VideoCommon/Src/VertexLoader_Normal.h
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_Position.cpp b/Source/Core/VideoCommon/Src/VertexLoader_Position.cpp
index 4dfd1c1869..4dfd1c1869 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_Position.cpp
+++ b/Source/Core/VideoCommon/Src/VertexLoader_Position.cpp
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_Position.h b/Source/Core/VideoCommon/Src/VertexLoader_Position.h
index 4874e25ae3..4874e25ae3 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_Position.h
+++ b/Source/Core/VideoCommon/Src/VertexLoader_Position.h
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_TextCoord.cpp b/Source/Core/VideoCommon/Src/VertexLoader_TextCoord.cpp
index bd6cb43f99..bd6cb43f99 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_TextCoord.cpp
+++ b/Source/Core/VideoCommon/Src/VertexLoader_TextCoord.cpp
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_TextCoord.h b/Source/Core/VideoCommon/Src/VertexLoader_TextCoord.h
index f61eb71c62..f61eb71c62 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_TextCoord.h
+++ b/Source/Core/VideoCommon/Src/VertexLoader_TextCoord.h
diff --git a/Source/Core/VideoCommon/Src/VideoCommon.h b/Source/Core/VideoCommon/Src/VideoCommon.h
index cea4bcaf00..d32d66d51c 100644
--- a/Source/Core/VideoCommon/Src/VideoCommon.h
+++ b/Source/Core/VideoCommon/Src/VideoCommon.h
@@ -21,6 +21,16 @@
 #include "Common.h"

 #include "pluginspecs_video.h"

 

+#if defined(_MSC_VER) && !defined(__x86_64__) && !defined(_M_X64)

+void * memcpy_amd(void *dest, const void *src, size_t n);

+unsigned char memcmp_mmx(const void* src1, const void* src2, int cmpsize);

+#define memcpy_gc memcpy_amd

+#define memcmp_gc memcmp_mmx

+#else

+#define memcpy_gc memcpy

+#define memcmp_gc memcmp

+#endif

+

 enum {

 	EFB_WIDTH = 640,

 	EFB_HEIGHT = 528,

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/memcpy_amd.cpp b/Source/Core/VideoCommon/Src/memcpy_amd.cpp
index 4bc3012e81..4bc3012e81 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/memcpy_amd.cpp
+++ b/Source/Core/VideoCommon/Src/memcpy_amd.cpp
diff --git a/Source/Core/VideoCommon/VideoCommon.vcproj b/Source/Core/VideoCommon/VideoCommon.vcproj
index 502d104e48..95dc4965d0 100644
--- a/Source/Core/VideoCommon/VideoCommon.vcproj
+++ b/Source/Core/VideoCommon/VideoCommon.vcproj
@@ -550,6 +550,46 @@
 		<Filter

 			Name="VertexLoading"

 			>

+			<File

+				RelativePath=".\Src\VertexLoader.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\VertexLoader.h"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\VertexLoader_Color.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\VertexLoader_Color.h"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\VertexLoader_Normal.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\VertexLoader_Normal.h"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\VertexLoader_Position.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\VertexLoader_Position.h"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\VertexLoader_TextCoord.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\VertexLoader_TextCoord.h"

+				>

+			</File>

 		</Filter>

 		<File

 			RelativePath=".\Src\DataReader.h"

@@ -564,6 +604,10 @@
 			>

 		</File>

 		<File

+			RelativePath=".\Src\memcpy_amd.cpp"

+			>

+		</File>

+		<File

 			RelativePath=".\Src\NativeVertexFormat.h"

 			>

 		</File>

diff --git a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj
index b6ad681dc7..7c635a2580 100644
--- a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj
+++ b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj
@@ -733,54 +733,6 @@
 				>

 			</File>

 			<File

-				RelativePath=".\Src\VertexLoader.cpp"

-				>

-				<FileConfiguration

-					Name="Release|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AssemblerOutput="4"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath=".\Src\VertexLoader.h"

-				>

-			</File>

-			<File

-				RelativePath=".\Src\VertexLoader_Color.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\Src\VertexLoader_Color.h"

-				>

-			</File>

-			<File

-				RelativePath=".\Src\VertexLoader_Normal.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\Src\VertexLoader_Normal.h"

-				>

-			</File>

-			<File

-				RelativePath=".\Src\VertexLoader_Position.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\Src\VertexLoader_Position.h"

-				>

-			</File>

-			<File

-				RelativePath=".\Src\VertexLoader_TextCoord.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\Src\VertexLoader_TextCoord.h"

-				>

-			</File>

-			<File

 				RelativePath=".\Src\VertexLoaderManager.cpp"

 				>

 			</File>

@@ -994,60 +946,6 @@
 			>

 		</File>

 		<File

-			RelativePath=".\Src\memcpy_amd.cpp"

-			>

-			<FileConfiguration

-				Name="Release|Win32"

-				>

-				<Tool

-					Name="VCCLCompilerTool"

-					UsePrecompiledHeader="0"

-				/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="Release|x64"

-				>

-				<Tool

-					Name="VCCLCompilerTool"

-					UsePrecompiledHeader="0"

-					PrecompiledHeaderThrough=""

-					PrecompiledHeaderFile=""

-				/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="Debug|Win32"

-				>

-				<Tool

-					Name="VCCLCompilerTool"

-					UsePrecompiledHeader="0"

-				/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="Debug|x64"

-				>

-				<Tool

-					Name="VCCLCompilerTool"

-					UsePrecompiledHeader="0"

-				/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="DebugFast|Win32"

-				>

-				<Tool

-					Name="VCCLCompilerTool"

-					UsePrecompiledHeader="0"

-				/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="DebugFast|x64"

-				>

-				<Tool

-					Name="VCCLCompilerTool"

-					UsePrecompiledHeader="0"

-				/>

-			</FileConfiguration>

-		</File>

-		<File

 			RelativePath=".\Src\Render.cpp"

 			>

 		</File>

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Globals.h b/Source/Plugins/Plugin_VideoOGL/Src/Globals.h
index 6a10796bad..e81905c407 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Globals.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Globals.h
@@ -25,16 +25,6 @@
 #include "Common.h"
 #include "Config.h"
 
-#if defined(_MSC_VER) && !defined(__x86_64__) && !defined(_M_X64)
-void * memcpy_amd(void *dest, const void *src, size_t n);
-unsigned char memcmp_mmx(const void* src1, const void* src2, int cmpsize);
-#define memcpy_gc memcpy_amd
-#define memcmp_gc memcmp_mmx
-#else
-#define memcpy_gc memcpy
-#define memcmp_gc memcmp
-#endif
-
 #include "VideoCommon.h"
 
 #endif