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, 14 deletions

diff --git a/LibOVR/Src/CAPI/Shaders/Distortion_vs.vsh b/LibOVR/Src/CAPI/Shaders/Distortion_vs.vsh
deleted file mode 100644
index ddf65e3..0000000
--- a/LibOVR/Src/CAPI/Shaders/Distortion_vs.vsh
+++ /dev/null
@@ -1,14 +0,0 @@
-float2   EyeToSourceUVScale;

-float2   EyeToSourceUVOffset;

-

-void main(in float2 Position   : POSITION,    in float4 Color : COLOR0,  in float2 TexCoord0 : TEXCOORD0,

-          out float4 oPosition : SV_Position, out float4 oColor : COLOR, out float3 oTexCoord0 : TEXCOORD0)

-{

-   oPosition.x = Position.x;

-   oPosition.y = Position.y;

-   oPosition.z = 0.5;

-   oPosition.w = 1.0;   

-   oTexCoord0  = float3(EyeToSourceUVScale * TexCoord0 + EyeToSourceUVOffset, 1);

-   oColor      = Color; // Used for vignette fade.

-}

-