Merge branch 'vanilla_0.4.4' and resolve conflicts

TODO: Validate for removed patches due to relocation

Resolved Conflicts:
	LibOVR/Src/Kernel/OVR_ThreadsWinAPI.cpp
	LibOVR/Src/OVR_Linux_HMDDevice.cpp
	LibOVR/Src/OVR_OSX_HMDDevice.cpp
	LibOVR/Src/OVR_Profile.cpp
	LibOVR/Src/OVR_Sensor2Impl.cpp
	LibOVR/Src/OVR_SensorFusion.cpp
	LibOVR/Src/OVR_SensorImpl.cpp
	LibOVR/Src/OVR_Win32_DeviceStatus.cpp
	LibOVR/Src/OVR_Win32_HIDDevice.cpp
	LibOVR/Src/OVR_Win32_HIDDevice.h
	LibOVR/Src/OVR_Win32_HMDDevice.cpp

1 files changed, 0 insertions, 9 deletions

diff --git a/LibOVR/Src/CAPI/Shaders/Distortion_ps.psh b/LibOVR/Src/CAPI/Shaders/Distortion_ps.psh
deleted file mode 100644
index 3e8b87f..0000000
--- a/LibOVR/Src/CAPI/Shaders/Distortion_ps.psh
+++ /dev/null
@@ -1,9 +0,0 @@
-Texture2D    Texture : register(t0);

-SamplerState Linear  : register(s0);

-

-float4 main(in float4 oPosition  : SV_Position, in float4 oColor : COLOR,

-            in float3 oTexCoord0 : TEXCOORD0) : SV_Target

-{

-	float3 Result = Texture.SampleLevel(Linear, oTexCoord0.xy, 0.0).rgb;

-	return float4(Result.r * oColor.r, Result.g * oColor.g, Result.b * oColor.b, 1.0);

-}