Merge branch 'master' into wii-network

# By Ryan Houdek (185) and others
# Via degasus (12) and others
* master: (625 commits)
  Revert "Don't open/close file for every file operation." as it was crashing PokePark in Windows builds.
  Array overrun fixed in VertexShaderCache for the DX11 plugin.
  Fixed DSPTool build.
  Windows build fix
  Go back to assuming every HID device is a wiimote on Windows. Fixed issue 6117. Unfixed issue 6031.
  VideoSoftware: Improve fog range adjustment by using less magic and more comments.
  revert RasterFont for VideoSoftware
  ogl: fix virtual xfb
  Windows build fix from web interface...
  Adjusted the audio loop criteria, using >= on the Wii and == on GC.  This fixes the audio static that occurred in Wii games after hours of play.
  Forced the exception check only for ARAM DMA transfers. Removed the Eternal Darkness boot hack and replaced it with an exception check.
  VideoSoftware: Implement fog range adjustment, fixing issue 6147.
  implement 4xSSAA for OGL
  move ogl-only settings into backend
  Fix description of disable fog, and move it to enhancements tab.
  Reverted rd76ca5783743 as it was made obsolete by r1d550f4496e4.
  Removed the tracking of the FIFO Writes as it was made obsolete by r1d550f4496e4.
  Forced the external exception check to occur sooner by changing the downcount.
  Mark the Direct3D9 backend deprecated.
  Prefer D3D11 and OpenGL over D3D9 by default.
  ...

Conflicts:
	CMakeLists.txt
	Source/Core/Common/Common.vcxproj.filters
	Source/Core/Common/Src/CommonPaths.h
	Source/Core/Core/Core.vcxproj.filters
	Source/Core/Core/Src/Core.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
	Source/VSProps/Dolphin.Win32.props
	Source/VSProps/Dolphin.x64.props

1 files changed, 224 insertions, 0 deletions

diff --git a/Source/Core/Common/Src/x64CPUDetect.cpp b/Source/Core/Common/Src/x64CPUDetect.cpp
new file mode 100644
index 0000000000..dcde313630
--- /dev/null
+++ b/Source/Core/Common/Src/x64CPUDetect.cpp
@@ -0,0 +1,224 @@
+// Copyright (C) 2003 Dolphin Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official SVN repository and contact information can be found at
+// http://code.google.com/p/dolphin-emu/
+
+#include <memory.h>
+
+#ifdef _WIN32
+#define _interlockedbittestandset workaround_ms_header_bug_platform_sdk6_set
+#define _interlockedbittestandreset workaround_ms_header_bug_platform_sdk6_reset
+#define _interlockedbittestandset64 workaround_ms_header_bug_platform_sdk6_set64
+#define _interlockedbittestandreset64 workaround_ms_header_bug_platform_sdk6_reset64
+#include <intrin.h>
+#undef _interlockedbittestandset
+#undef _interlockedbittestandreset
+#undef _interlockedbittestandset64
+#undef _interlockedbittestandreset64
+#else
+
+//#include <config/i386/cpuid.h>
+#ifndef _M_GENERIC
+#include <xmmintrin.h>
+#endif
+
+#if defined __FreeBSD__
+#include <sys/types.h>
+#include <machine/cpufunc.h>
+#else
+static inline void do_cpuid(unsigned int *eax, unsigned int *ebx,
+							unsigned int *ecx, unsigned int *edx)
+{
+#if defined _M_GENERIC
+	(*eax) = (*ebx) = (*ecx) = (*edx) = 0;
+#elif defined _LP64
+	// Note: EBX is reserved on Mac OS X and in PIC on Linux, so it has to
+	// restored at the end of the asm block.
+	__asm__ (
+		"cpuid;"
+		"movl  %%ebx,%1;"
+		: "=a" (*eax),
+		  "=S" (*ebx),
+		  "=c" (*ecx),
+		  "=d" (*edx)
+		: "a"  (*eax)
+		: "rbx"
+		);
+#else
+	__asm__ (
+		"cpuid;"
+		"movl  %%ebx,%1;"
+		: "=a" (*eax),
+		  "=S" (*ebx),
+		  "=c" (*ecx),
+		  "=d" (*edx)
+		: "a"  (*eax)
+		: "ebx"
+		);
+#endif
+}
+#endif /* defined __FreeBSD__ */
+
+static void __cpuid(int info[4], int x)
+{
+#if defined __FreeBSD__
+    do_cpuid((unsigned int)x, (unsigned int*)info);
+#else
+	unsigned int eax = x, ebx = 0, ecx = 0, edx = 0;
+	do_cpuid(&eax, &ebx, &ecx, &edx);
+	info[0] = eax;
+	info[1] = ebx;
+	info[2] = ecx;
+	info[3] = edx;
+#endif
+}
+
+#endif
+
+#include "Common.h"
+#include "CPUDetect.h"
+#include "StringUtil.h"
+
+CPUInfo cpu_info;
+
+CPUInfo::CPUInfo() {
+	Detect();
+}
+
+// Detects the various cpu features
+void CPUInfo::Detect()
+{
+	memset(this, 0, sizeof(*this));
+#ifdef _M_IX86
+	Mode64bit = false;
+#elif defined (_M_X64)
+	Mode64bit = true;
+	OS64bit = true;
+#endif
+	num_cores = 1;
+
+#ifdef _WIN32
+#ifdef _M_IX86
+	BOOL f64 = false;
+	IsWow64Process(GetCurrentProcess(), &f64);
+	OS64bit = (f64 == TRUE) ? true : false;
+#endif
+#endif
+	
+	// Set obvious defaults, for extra safety
+	if (Mode64bit) {
+		bSSE = true;
+		bSSE2 = true;
+		bLongMode = true;
+	}
+	
+	// Assume CPU supports the CPUID instruction. Those that don't can barely
+	// boot modern OS:es anyway.
+	int cpu_id[4];
+	memset(cpu_string, 0, sizeof(cpu_string));
+	
+	// Detect CPU's CPUID capabilities, and grab cpu string
+	__cpuid(cpu_id, 0x00000000);
+	u32 max_std_fn = cpu_id[0];  // EAX
+	*((int *)cpu_string) = cpu_id[1];
+	*((int *)(cpu_string + 4)) = cpu_id[3];
+	*((int *)(cpu_string + 8)) = cpu_id[2];
+	__cpuid(cpu_id, 0x80000000);
+	u32 max_ex_fn = cpu_id[0];
+	if (!strcmp(cpu_string, "GenuineIntel"))
+		vendor = VENDOR_INTEL;
+	else if (!strcmp(cpu_string, "AuthenticAMD"))
+		vendor = VENDOR_AMD;
+	else
+		vendor = VENDOR_OTHER;
+	
+	// Set reasonable default brand string even if brand string not available.
+	strcpy(brand_string, cpu_string);
+	
+	// Detect family and other misc stuff.
+	bool ht = false;
+	HTT = ht;
+	logical_cpu_count = 1;
+	if (max_std_fn >= 1) {
+		__cpuid(cpu_id, 0x00000001);
+		logical_cpu_count = (cpu_id[1] >> 16) & 0xFF;
+		ht = (cpu_id[3] >> 28) & 1;
+
+		if ((cpu_id[3] >> 25) & 1) bSSE = true;
+		if ((cpu_id[3] >> 26) & 1) bSSE2 = true;
+		if ((cpu_id[2])       & 1) bSSE3 = true;
+		if ((cpu_id[2] >> 9)  & 1) bSSSE3 = true;
+		if ((cpu_id[2] >> 19) & 1) bSSE4_1 = true;
+		if ((cpu_id[2] >> 20) & 1) bSSE4_2 = true;
+		if ((cpu_id[2] >> 28) & 1) bAVX = true;
+		if ((cpu_id[2] >> 25) & 1) bAES = true;
+	}
+	if (max_ex_fn >= 0x80000004) {
+		// Extract brand string
+		__cpuid(cpu_id, 0x80000002);
+		memcpy(brand_string, cpu_id, sizeof(cpu_id));
+		__cpuid(cpu_id, 0x80000003);
+		memcpy(brand_string + 16, cpu_id, sizeof(cpu_id));
+		__cpuid(cpu_id, 0x80000004);
+		memcpy(brand_string + 32, cpu_id, sizeof(cpu_id));
+	}
+	if (max_ex_fn >= 0x80000001) {
+		// Check for more features.
+		__cpuid(cpu_id, 0x80000001);
+		if (cpu_id[2] & 1) bLAHFSAHF64 = true;
+		if ((cpu_id[3] >> 29) & 1) bLongMode = true;
+	}
+
+	num_cores = (logical_cpu_count == 0) ? 1 : logical_cpu_count;
+	
+	if (max_ex_fn >= 0x80000008) {
+		// Get number of cores. This is a bit complicated. Following AMD manual here.
+		__cpuid(cpu_id, 0x80000008);
+		int apic_id_core_id_size = (cpu_id[2] >> 12) & 0xF;
+		if (apic_id_core_id_size == 0) {
+			if (ht) {
+				// New mechanism for modern Intel CPUs.
+				if (vendor == VENDOR_INTEL) {
+					__cpuid(cpu_id, 0x00000004);
+					int cores_x_package = ((cpu_id[0] >> 26) & 0x3F) + 1;
+					HTT = (cores_x_package < logical_cpu_count);
+					cores_x_package = ((logical_cpu_count % cores_x_package) == 0) ? cores_x_package : 1;
+					num_cores = (cores_x_package > 1) ? cores_x_package : num_cores;
+					logical_cpu_count /= cores_x_package;
+				}
+			}
+		} else {
+			// Use AMD's new method.
+			num_cores = (cpu_id[2] & 0xFF) + 1;
+		}
+	} 
+}
+
+// Turn the cpu info into a string we can show
+std::string CPUInfo::Summarize()
+{
+	std::string sum(cpu_string);
+	if (bSSE) sum += ", SSE";
+	if (bSSE2) sum += ", SSE2";
+	if (bSSE3) sum += ", SSE3";
+	if (bSSSE3) sum += ", SSSE3";
+	if (bSSE4_1) sum += ", SSE4.1";
+	if (bSSE4_2) sum += ", SSE4.2";
+	if (HTT) sum += ", HTT";
+	if (bAVX) sum += ", AVX";
+	if (bAES) sum += ", AES";
+	if (bLongMode) sum += ", 64-bit support";
+	return sum;
+}