GL Vertex loader moved to VideoCommon.

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

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"

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,

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"
@@ -563,6 +603,10 @@
 			RelativePath=".\Src\Fifo.h"
 			>
 		</File>
+		<File
+			RelativePath=".\Src\memcpy_amd.cpp"
+			>
+		</File>
 		<File
 			RelativePath=".\Src\NativeVertexFormat.h"
 			>

Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj

@@ -732,54 +732,6 @@
 				RelativePath=".\Src\NativeVertexFormat.cpp"
 				>
 			</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"
 				>
@@ -993,60 +945,6 @@
 			RelativePath=".\Src\main.h"
 			>
 		</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"
 			>

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