Merge 'master' into shader-uids-awesome.

Conflicts:
	Source/Core/VideoCommon/Src/BPMemory.h
	Source/Core/VideoCommon/Src/LightingShaderGen.cpp
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Core/VideoCommon/Src/PixelShaderGen.h
	Source/Core/VideoCommon/Src/PixelShaderManager.cpp
	Source/Core/VideoCommon/Src/VertexShaderGen.cpp
	Source/Core/VideoCommon/Src/VertexShaderGen.h

8 files changed, 238 insertions, 62 deletions

diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.cpp
new file mode 100644
index 0000000000..2d01d38f23
--- /dev/null
+++ b/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.cpp
@@ -0,0 +1,67 @@
+// 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 "Android.h"
+
+namespace ciface
+{
+
+namespace Android
+{
+
+void Init( std::vector<ControllerInterface::Device*>& devices )
+{
+	devices.push_back(new Touchscreen());
+}
+
+// Touchscreens and stuff
+std::string Touchscreen::GetName() const
+{
+	return "Touchscreen";
+}
+
+std::string Touchscreen::GetSource() const
+{
+	return "Android";
+}
+
+int Touchscreen::GetId() const
+{
+	return 0;
+}
+Touchscreen::Touchscreen()
+{
+	AddInput(new Button(ButtonManager::BUTTON_A));
+	AddInput(new Button(ButtonManager::BUTTON_B));
+	AddInput(new Button(ButtonManager::BUTTON_START));
+}
+// Buttons and stuff
+
+std::string Touchscreen::Button::GetName() const
+{
+	std::ostringstream ss;
+	ss << "Button " << (int)m_index;
+	return ss.str();
+}
+
+ControlState Touchscreen::Button::GetState() const
+{
+	return ButtonManager::GetButtonPressed(m_index);
+}
+
+}
+}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h b/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h
new file mode 100644
index 0000000000..9bdb52a61d
--- /dev/null
+++ b/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h
@@ -0,0 +1,57 @@
+// 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/
+#ifndef _CIFACE_ANDROID_H_
+#define _CIFACE_ANDROID_H_
+
+#include "../ControllerInterface.h"
+#include "Android/ButtonManager.h"
+
+namespace ciface
+{
+namespace Android
+{
+
+void Init( std::vector<ControllerInterface::Device*>& devices );
+class Touchscreen : public ControllerInterface::Device
+{
+private:
+	class Button : public Input
+	{
+	public:
+		std::string GetName() const;
+		Button(ButtonManager::ButtonType index) : m_index(index) {}
+		ControlState GetState() const;
+	private:
+		 const ButtonManager::ButtonType m_index;
+	};
+
+public:
+	bool UpdateInput() { return true; }
+	bool UpdateOutput() { return true; }
+
+	Touchscreen();
+	~Touchscreen() {}
+
+	std::string GetName() const;
+	int GetId() const;
+	std::string GetSource() const;
+};
+
+}
+}
+
+#endif
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
index 8e96231674..6db79605a7 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
@@ -15,6 +15,9 @@
 #ifdef CIFACE_USE_SDL
 	#include "SDL/SDL.h"
 #endif
+#ifdef CIFACE_USE_ANDROID
+	#include "Android/Android.h"
+#endif
 
 #include "Thread.h"
 
@@ -50,6 +53,9 @@ void ControllerInterface::Initialize()
 #ifdef CIFACE_USE_SDL
 	ciface::SDL::Init(m_devices);
 #endif
+#ifdef CIFACE_USE_ANDROID
+	ciface::Android::Init(m_devices);
+#endif
 
 	m_is_init = true;
 }
@@ -100,6 +106,9 @@ void ControllerInterface::Shutdown()
 	// TODO: there seems to be some sort of memory leak with SDL, quit isn't freeing everything up
 	SDL_Quit();
 #endif
+#ifdef CIFACE_USE_ANDROID
+	// nothing needed
+#endif
 
 	m_is_init = false;
 }
@@ -157,7 +166,7 @@ bool ControllerInterface::UpdateOutput(const bool force)
 	if (force)
 		lk.lock();
 	else if (!lk.try_lock())
-			return false;
+		return false;
 
 	size_t ok_count = 0;
 
@@ -173,7 +182,7 @@ bool ControllerInterface::UpdateOutput(const bool force)
 //
 //		Device :: ~Device
 //
-// dtor, delete all inputs/outputs on device destruction
+// Destructor, delete all inputs/outputs on device destruction
 //
 ControllerInterface::Device::~Device()
 {
@@ -209,9 +218,9 @@ void ControllerInterface::Device::AddOutput(Output* const o)
 //
 //		Device :: ClearInputState
 //
-// device classes should override this func
-// ControllerInterface will call this when the device returns failure durring UpdateInput
-// used to try to set all buttons and axes to their default state when user unplugs a gamepad durring play
+// Device classes should override this function
+// ControllerInterface will call this when the device returns failure during UpdateInput
+// used to try to set all buttons and axes to their default state when user unplugs a gamepad during play
 // buttons/axes that were held down at the time of unplugging should be seen as not pressed after unplugging
 //
 void ControllerInterface::Device::ClearInputState()
@@ -239,8 +248,10 @@ ControlState ControllerInterface::InputReference::State( const ControlState igno
 
 	// bit of hax for "NOT" to work at start of expression
 	if (ci != ce)
+	{
 		if (ci->mode == 2)
 			state = 1;
+	}
 
 	for (; ci!=ce; ++ci)
 	{
@@ -354,7 +365,8 @@ bool ControllerInterface::DeviceQualifier::operator==(const ControllerInterface:
 		if (name == devq.name)
 			if (source == devq.source)
 				return true;
-	return false;	
+
+	return false;
 }
 
 //
@@ -421,7 +433,9 @@ void ControllerInterface::UpdateReference(ControllerInterface::ControlReference*
 				break;	// no terminating '`' character
 		}
 		else
+		{
 			ctrl_str += c;
+		}
 	}
 }
 
@@ -478,7 +492,9 @@ ControllerInterface::Device::Control* ControllerInterface::InputReference::Detec
 					return *i;
 			}
 			else if ((*i)->GetState() < (1 - INPUT_DETECT_THRESHOLD))
+			{
 				*state = false;
+			}
 		}
 		Common::SleepCurrentThread(10); time += 10;
 	}
@@ -490,8 +506,8 @@ ControllerInterface::Device::Control* ControllerInterface::InputReference::Detec
 //
 //		OutputReference :: Detect
 //
-// totally different from the inputReference detect / i have them combined so it was simplier to make the gui.
-// the gui doesnt know the difference between an input and an output / its odd but i was lazy and it was easy
+// Totally different from the inputReference detect / I have them combined so it was simpler to make the GUI.
+// The GUI doesn't know the difference between an input and an output / it's odd but I was lazy and it was easy
 //
 // set all binded outputs to <range> power for x milliseconds return false
 //
@@ -499,7 +515,7 @@ ControllerInterface::Device::Control* ControllerInterface::OutputReference::Dete
 {
 	// ignore device
 
-	// dont hang if we dont even have any controls mapped
+	// don't hang if we don't even have any controls mapped
 	if (m_controls.size())
 	{
 		State(1);
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
index b846bb56e8..8c1a044860 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
@@ -29,14 +29,17 @@
 #if defined(__APPLE__)
 	#define CIFACE_USE_OSX
 #endif
-
-// idk in case i wanted to change it to double or somethin, idk what's best
+#ifdef ANDROID
+	#define CIFACE_USE_ANDROID
+#endif
+		
+// idk in case I wanted to change it to double or something, idk what's best
 typedef float ControlState;
 
 //
 //		ControllerInterface
 //
-// some crazy shit i made to control different device inputs and outputs
+// some crazy shit I made to control different device inputs and outputs
 // from lots of different sources, hopefully more easily
 //
 class ControllerInterface
@@ -186,7 +189,7 @@ public:
 	//
 	// these are what you create to actually use the inputs, InputReference or OutputReference
 	//
-	// after being binded to devices and controls with ControllerInterface::UpdateReference,
+	// after being bound to devices and controls with ControllerInterface::UpdateReference,
 	//		each one can link to multiple devices and controls
 	//		when you change a ControlReference's expression,
 	//		you must use ControllerInterface::UpdateReference on it to rebind controls
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp
index 9bc5364e76..916d142149 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp
@@ -22,13 +22,13 @@ static const struct
 } force_type_names[] =
 {
 	{GUID_ConstantForce, "Constant"},	// DICONSTANTFORCE
-	{GUID_RampForce, "Ramp"},	// DIRAMPFORCE
-	{GUID_Square, "Square"},	// DIPERIODIC ...
+	{GUID_RampForce, "Ramp"},			// DIRAMPFORCE
+	{GUID_Square, "Square"},			// DIPERIODIC ...
 	{GUID_Sine, "Sine"},
 	{GUID_Triangle, "Triangle"},
 	{GUID_SawtoothUp, "Sawtooth Up"},
 	{GUID_SawtoothDown, "Sawtooth Down"},
-	//{GUID_Spring, "Spring"},	// DICUSTOMFORCE ... < i think
+	//{GUID_Spring, "Spring"},			// DICUSTOMFORCE ... < I think
 	//{GUID_Damper, "Damper"},
 	//{GUID_Inertia, "Inertia"},
 	//{GUID_Friction, "Friction"},
@@ -70,9 +70,9 @@ void GetXInputGUIDS( std::vector<DWORD>& guids )
 	if( FAILED(hr) || pIWbemLocator == NULL )
 		goto LCleanup;
 
-	bstrNamespace = SysAllocString( L"\\\\.\\root\\cimv2" );if( bstrNamespace == NULL ) goto LCleanup;		
-	bstrClassName = SysAllocString( L"Win32_PNPEntity" );   if( bstrClassName == NULL ) goto LCleanup;		
-	bstrDeviceID  = SysAllocString( L"DeviceID" );			if( bstrDeviceID == NULL )  goto LCleanup;		
+	bstrNamespace = SysAllocString( L"\\\\.\\root\\cimv2" );if( bstrNamespace == NULL ) goto LCleanup;
+	bstrClassName = SysAllocString( L"Win32_PNPEntity" );   if( bstrClassName == NULL ) goto LCleanup;
+	bstrDeviceID  = SysAllocString( L"DeviceID" );			if( bstrDeviceID == NULL )  goto LCleanup;
 	
 	// Connect to WMI 
 	hr = pIWbemLocator->ConnectServer( bstrNamespace, NULL, NULL, 0L, 0L, NULL, NULL, &pIWbemServices );
@@ -81,7 +81,7 @@ void GetXInputGUIDS( std::vector<DWORD>& guids )
 
 	// Switch security level to IMPERSONATE. 
 	CoSetProxyBlanket( pIWbemServices, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, 
-					   RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE );					
+					   RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE );
 
 	hr = pIWbemServices->CreateInstanceEnum( bstrClassName, 0, NULL, &pEnumDevices ); 
 	if( FAILED(hr) || pEnumDevices == NULL )
@@ -184,7 +184,7 @@ void InitJoystick(IDirectInput8* const idi8, std::vector<ControllerInterface::De
 				}
 
 				Joystick* js = new Joystick(/*&*i, */js_device, name_counts[i->tszInstanceName]++);
-				// only add if it has some inputs/outpus
+				// only add if it has some inputs/outputs
 				if (js->Inputs().size() || js->Outputs().size())
 					devices.push_back(js);
 				else
@@ -196,7 +196,6 @@ void InitJoystick(IDirectInput8* const idi8, std::vector<ControllerInterface::De
 				js_device->Release();
 			}
 		}
-		
 	}
 }
 
@@ -226,7 +225,7 @@ Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVI
 	if (FAILED(m_device->GetCapabilities(&js_caps)))
 		return;
 
-	// max of 32 buttons and 4 hats / the limit of the data format i am using
+	// max of 32 buttons and 4 hats / the limit of the data format I am using
 	js_caps.dwButtons = std::min((DWORD)32, js_caps.dwButtons);
 	js_caps.dwPOVs = std::min((DWORD)4, js_caps.dwPOVs);
 
@@ -258,9 +257,9 @@ Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVI
 		range.lMin = -(1 << 7);
 		range.lMax = (1 << 7);
 		m_device->SetProperty(DIPROP_RANGE, &range.diph);
-		// but i guess not all devices support setting range
-		// so i getproperty right afterward incase it didn't set :P
-		// this also checks that the axis is present
+		// but I guess not all devices support setting range
+		// so I getproperty right afterward incase it didn't set.
+		// This also checks that the axis is present
 		if (SUCCEEDED(m_device->GetProperty(DIPROP_RANGE, &range.diph)))
 		{
 			const LONG base = (range.lMin + range.lMax) / 2;
@@ -319,9 +318,13 @@ Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVI
 				eff.lpvTypeSpecificParams = &diCF;
 			}
 			else if (1 == f)
+			{
 				eff.cbTypeSpecificParams = sizeof(DIRAMPFORCE);
+			}
 			else
+			{
 				eff.cbTypeSpecificParams = sizeof(DIPERIODIC);
+			}
 			
 			LPDIRECTINPUTEFFECT pEffect;
 			if (SUCCEEDED(m_device->CreateEffect(force_type_names[f].guid, &eff, &pEffect, NULL)))
@@ -400,7 +403,7 @@ bool Joystick::UpdateInput()
 	HRESULT hr = 0;
 
 	// just always poll,
-	// msdn says if this isn't needed it doesnt do anything
+	// MSDN says if this isn't needed it doesn't do anything
 	m_device->Poll();
 
 	if (m_buffered)
@@ -427,7 +430,9 @@ bool Joystick::UpdateInput()
 		}
 	}
 	else
+	{
 		hr = m_device->GetDeviceState(sizeof(m_state_in), &m_state_in);
+	}
 
 	// try reacquire if input lost
 	if (DIERR_INPUTLOST == hr || DIERR_NOTACQUIRED == hr)
@@ -460,12 +465,16 @@ bool Joystick::UpdateOutput()
 				ok_count += SUCCEEDED(i->iface->SetParameters(&eff, DIEP_TYPESPECIFICPARAMS | DIEP_START));
 			}
 			else
+			{
 				ok_count += SUCCEEDED(i->iface->Stop());
+			}
 
 			i->params = NULL;
 		}
 		else
+		{
 			++ok_count;
+		}
 	}
 
 	return (m_state_out.size() == ok_count);
@@ -492,7 +501,9 @@ std::string Joystick::Axis::GetName() const
 	}
 	// slider
 	else
+	{
 		ss << "Slider " << (int)(m_index - 6);
+	}
 
 	ss << (m_range < 0 ? '-' : '+');
 	return ss.str();
@@ -527,7 +538,7 @@ ControlState Joystick::Button::GetState() const
 ControlState Joystick::Hat::GetState() const
 {
 	// can this func be simplified ?
-	// hat centered code from msdn
+	// hat centered code from MSDN
 	if (0xFFFF == LOWORD(m_hat))
 		return 0;
 	return (abs((int)(m_hat / 4500 - m_direction * 2 + 8) % 8 - 4) > 2);
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp
index aea12c065c..ea6452376d 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp
@@ -6,7 +6,7 @@
 #include "DInput.h"
 
 	// (lower would be more sensitive) user can lower sensitivity by setting range
-	// seems decent here ( at 8 ), I dont think anyone would need more sensitive than this
+	// seems decent here ( at 8 ), I don't think anyone would need more sensitive than this
 	// and user can lower it much farther than they would want to with the range
 #define MOUSE_AXIS_SENSITIVITY		8
 
@@ -47,7 +47,7 @@ void InitKeyboardMouse(IDirectInput8* const idi8, std::vector<ControllerInterfac
 	hwnd = _hwnd;
 
 	// mouse and keyboard are a combined device, to allow shift+click and stuff
-	// if thats dumb, i will make a VirtualDevice class that just uses ranges of inputs/outputs from other devices
+	// if that's dumb, I will make a VirtualDevice class that just uses ranges of inputs/outputs from other devices
 	// so there can be a separated Keyboard and mouse, as well as combined KeyboardMouse
 
 	LPDIRECTINPUTDEVICE8 kb_device = NULL;
@@ -56,15 +56,19 @@ void InitKeyboardMouse(IDirectInput8* const idi8, std::vector<ControllerInterfac
 	if (SUCCEEDED(idi8->CreateDevice( GUID_SysKeyboard, &kb_device, NULL)))
 	{
 		if (SUCCEEDED(kb_device->SetDataFormat(&c_dfDIKeyboard)))
-		if (SUCCEEDED(kb_device->SetCooperativeLevel(NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
 		{
-			if (SUCCEEDED(idi8->CreateDevice( GUID_SysMouse, &mo_device, NULL )))
+			if (SUCCEEDED(kb_device->SetCooperativeLevel(NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
 			{
-				if (SUCCEEDED(mo_device->SetDataFormat(&c_dfDIMouse2)))
-				if (SUCCEEDED(mo_device->SetCooperativeLevel(NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
+				if (SUCCEEDED(idi8->CreateDevice( GUID_SysMouse, &mo_device, NULL )))
 				{
-					devices.push_back(new KeyboardMouse(kb_device, mo_device));
-					return;
+					if (SUCCEEDED(mo_device->SetDataFormat(&c_dfDIMouse2)))
+					{
+						if (SUCCEEDED(mo_device->SetCooperativeLevel(NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
+						{
+							devices.push_back(new KeyboardMouse(kb_device, mo_device));
+							return;
+						}
+					}
 				}
 			}
 		}
@@ -177,7 +181,7 @@ bool KeyboardMouse::UpdateInput()
 
 	if (SUCCEEDED(kb_hr) && SUCCEEDED(mo_hr))
 	{
-		// need to smooth out the axes, otherwise it doesnt work for shit
+		// need to smooth out the axes, otherwise it doesn't work for shit
 		for (unsigned int i = 0; i < 3; ++i)
 			((&m_state_in.mouse.lX)[i] += (&tmp_mouse.lX)[i]) /= 2;
 
@@ -203,7 +207,9 @@ bool KeyboardMouse::UpdateOutput()
 			memset( this, 0, sizeof(*this) );
 			type = INPUT_KEYBOARD;
 			ki.wVk = key;
-			if (up) ki.dwFlags = KEYEVENTF_KEYUP;
+
+			if (up)
+				ki.dwFlags = KEYEVENTF_KEYUP;
 		}
 	};
 
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp
index c5ee3af23f..6c74c55d97 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp
@@ -34,7 +34,7 @@ void Init( std::vector<ControllerInterface::Device*>& devices )
 	std::map<std::string, int>	name_counts;
 
 	if (SDL_Init( SDL_INIT_FLAGS ) >= 0)
-    {
+	{
 		// joysticks
 		for(int i = 0; i < SDL_NumJoysticks(); ++i)
 		{
@@ -49,7 +49,7 @@ void Init( std::vector<ControllerInterface::Device*>& devices )
 					delete js;
 			}
 		}
-    }
+	}
 }
 
 Joystick::Joystick(SDL_Joystick* const joystick, const int sdl_index, const unsigned int index)
@@ -63,7 +63,7 @@ Joystick::Joystick(SDL_Joystick* const joystick, const int sdl_index, const unsi
 	// "why don't my 360 gamepad triggers/rumble work correctly"
 #ifdef _WIN32
 	// checking the name is probably good (and hacky) enough
-	// but i'll double check with the num of buttons/axes
+	// but I'll double check with the num of buttons/axes
 	std::string lcasename = GetName();
 	std::transform(lcasename.begin(), lcasename.end(), lcasename.begin(), tolower);
 
@@ -204,7 +204,9 @@ void Joystick::ConstantEffect::SetState(const ControlState state)
 		m_effect.effect.constant.length = SDL_HAPTIC_INFINITY;
 	}
 	else
+	{
 		m_effect.effect.type = 0;
+	}
 
 	const Sint16 old = m_effect.effect.constant.level;
 	m_effect.effect.constant.level = state * 0x7FFF;
@@ -220,7 +222,9 @@ void Joystick::RampEffect::SetState(const ControlState state)
 		m_effect.effect.ramp.length = SDL_HAPTIC_INFINITY;
 	}
 	else
+	{
 		m_effect.effect.type = 0;
+	}
 
 	const Sint16 old = m_effect.effect.ramp.start;
 	m_effect.effect.ramp.start = state * 0x7FFF;
@@ -235,15 +239,17 @@ void Joystick::SineEffect::SetState(const ControlState state)
 		m_effect.effect.type = SDL_HAPTIC_SINE;
 		m_effect.effect.periodic.length = 250;
 	}
-	else {
+	else
+	{
 		m_effect.effect.type = 0;
 	}
 
 	const Sint16 old = m_effect.effect.periodic.magnitude;
-        m_effect.effect.periodic.period = 5;
+	m_effect.effect.periodic.period = 5;
 	m_effect.effect.periodic.magnitude = state * 0x5000;
-        m_effect.effect.periodic.attack_length = 0;
-        m_effect.effect.periodic.fade_length = 500;
+	m_effect.effect.periodic.attack_length = 0;
+	m_effect.effect.periodic.fade_length = 500;
+
 	if (old != m_effect.effect.periodic.magnitude)
 		m_effect.changed = true;
 }
@@ -255,15 +261,17 @@ void Joystick::SquareEffect::SetState(const ControlState state)
 		m_effect.effect.type = SDL_HAPTIC_SQUARE;
 		m_effect.effect.periodic.length = 250;
 	}
-	else {
+	else
+	{
 		m_effect.effect.type = 0;
 	}
 
 	const Sint16 old = m_effect.effect.periodic.magnitude;
-        m_effect.effect.periodic.period = 5;
+	m_effect.effect.periodic.period = 5;
 	m_effect.effect.periodic.magnitude = state * 0x5000;
-        m_effect.effect.periodic.attack_length = 0;
-        m_effect.effect.periodic.fade_length = 100;
+	m_effect.effect.periodic.attack_length = 0;
+	m_effect.effect.periodic.fade_length = 100;
+
 	if (old != m_effect.effect.periodic.magnitude)
 		m_effect.changed = true;
 }
@@ -275,15 +283,17 @@ void Joystick::TriangleEffect::SetState(const ControlState state)
 		m_effect.effect.type = SDL_HAPTIC_TRIANGLE;
 		m_effect.effect.periodic.length = 250;
 	}
-	else {
+	else
+	{
 		m_effect.effect.type = 0;
 	}
 
 	const Sint16 old = m_effect.effect.periodic.magnitude;
-        m_effect.effect.periodic.period = 5;
+	m_effect.effect.periodic.period = 5;
 	m_effect.effect.periodic.magnitude = state * 0x5000;
-        m_effect.effect.periodic.attack_length = 0;
-        m_effect.effect.periodic.fade_length = 100;
+	m_effect.effect.periodic.attack_length = 0;
+	m_effect.effect.periodic.fade_length = 100;
+
 	if (old != m_effect.effect.periodic.magnitude)
 		m_effect.changed = true;
 }
@@ -316,7 +326,9 @@ bool Joystick::UpdateOutput()
 			else	// effect is already uploaded
 			{
 				if (i->effect.type)	// if ouputstate >0
+				{
 					SDL_HapticUpdateEffect(m_haptic, i->id, &i->effect);	// update the effect
+				}
 				else
 				{
 					SDL_HapticStopEffect(m_haptic, i->id);	// else, stop and remove the effect
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp b/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp
index 7fe54d0d09..3c7f3c48ae 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp
@@ -31,13 +31,13 @@ static const struct
 	{ "Thumb R", XINPUT_GAMEPAD_RIGHT_THUMB }
 };
 
-static const char* const named_triggers[] =	
+static const char* const named_triggers[] =
 {
 	"Trigger L",
 	"Trigger R"
 };
 
-static const char* const named_axes[] =	
+static const char* const named_axes[] =
 {
 	"Left X",
 	"Left Y",
@@ -45,7 +45,7 @@ static const char* const named_axes[] =
 	"Right Y"
 };
 
-static const char* const named_motors[] =	
+static const char* const named_motors[] =
 {
 	"Motor L",
 	"Motor R"
@@ -66,17 +66,19 @@ Device::Device(const XINPUT_CAPABILITIES& caps, u8 index)
 	ZeroMemory(&m_current_state_out, sizeof(m_current_state_out));
 
 	// XInputGetCaps seems to always claim all capabilities are supported
-	// but i will leave all this stuff in, incase m$ fixes xinput up a bit
+	// but I will leave all this stuff in, incase m$ fixes xinput up a bit
 
 	// get supported buttons
 	for (int i = 0; i != sizeof(named_buttons)/sizeof(*named_buttons); ++i)
+	{
 		if (named_buttons[i].bitmask & caps.Gamepad.wButtons)
 			AddInput(new Button(i, m_state_in.Gamepad.wButtons));
+	}
 
 	// get supported triggers
 	for (int i = 0; i != sizeof(named_triggers)/sizeof(*named_triggers); ++i)
 	{
-		//BYTE val = (&caps.Gamepad.bLeftTrigger)[i];	// should be max value / msdn lies
+		//BYTE val = (&caps.Gamepad.bLeftTrigger)[i];	// should be max value / MSDN lies
 		if ((&caps.Gamepad.bLeftTrigger)[i])
 			AddInput(new Trigger(i, (&m_state_in.Gamepad.bLeftTrigger)[i], 255 ));
 	}
@@ -84,7 +86,7 @@ Device::Device(const XINPUT_CAPABILITIES& caps, u8 index)
 	// get supported axes
 	for (int i = 0; i != sizeof(named_axes)/sizeof(*named_axes); ++i)
 	{
-		//SHORT val = (&caps.Gamepad.sThumbLX)[i];  // xinput doesnt give the range / msdn is lier
+		//SHORT val = (&caps.Gamepad.sThumbLX)[i];  // xinput doesn't give the range / MSDN is a liar
 		if ((&caps.Gamepad.sThumbLX)[i])
 		{
 			const SHORT& ax = (&m_state_in.Gamepad.sThumbLX)[i];
@@ -114,8 +116,8 @@ void Device::ClearInputState()
 std::string Device::GetName() const
 {
 	// why aren't these defined
-	// subtype doesn't seem to work, i tested with 2 diff arcade sticks, both were shown as gamepad
-	// ill leave it in anyway, maybe m$ will fix it
+	// subtype doesn't seem to work, I tested with 2 different arcade sticks, both were shown as gamepad
+	// I'll leave it in anyway, maybe m$ will fix it
 
 	switch (m_subtype)
 	{
@@ -140,7 +142,7 @@ std::string Device::GetSource() const
 	return "XInput";
 }
 
-// update i/o
+// Update I/O
 
 bool Device::UpdateInput()
 {
@@ -157,7 +159,9 @@ bool Device::UpdateOutput()
 		return (ERROR_SUCCESS == XInputSetState(m_index, &m_state_out));
 	}
 	else
+	{
 		return true;
+	}
 }
 
 // GET name/source/id