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, 144 insertions, 89 deletions

diff --git a/LibOVR/Projects/Win32/VS2012/LibOVR.vcxproj b/LibOVR/Projects/Win32/VS2012/LibOVR.vcxproj
index 0e8505c..94bee8c 100644
--- a/LibOVR/Projects/Win32/VS2012/LibOVR.vcxproj
+++ b/LibOVR/Projects/Win32/VS2012/LibOVR.vcxproj
@@ -21,22 +21,40 @@
   <ItemGroup>

     <ClInclude Include="..\..\..\Src\CAPI\CAPI_DistortionRenderer.h" />

     <ClInclude Include="..\..\..\Src\CAPI\CAPI_FrameTimeManager.h" />

-    <ClInclude Include="..\..\..\Src\CAPI\CAPI_GlobalState.h" />

     <ClInclude Include="..\..\..\Src\CAPI\CAPI_HMDRenderState.h" />

     <ClInclude Include="..\..\..\Src\CAPI\CAPI_HMDState.h" />

+    <ClInclude Include="..\..\..\Src\CAPI\CAPI_HSWDisplay.h" />

+    <ClInclude Include="..\..\..\Src\CAPI\CAPI_LatencyStatistics.h" />

     <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_DistortionRenderer.h" />

+    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_HSWDisplay.h" />

     <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_DistortionRenderer.h" />

+    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_HSWDisplay.h" />

     <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_DistortionRenderer.h" />

     <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_Util.h" />

-    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D9_DistortionRenderer.h" />

+    <ClInclude Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_DistortionRenderer.h" />

+    <ClInclude Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_HSWDisplay.h" />

+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GLE.h" />

+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GLE_GL.h" />

     <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_DistortionRenderer.h" />

+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_DistortionShaders.h" />

+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_HSWDisplay.h" />

     <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_Util.h" />

+    <ClInclude Include="..\..\..\Src\Displays\OVR_Display.h" />

+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_Display.h" />

+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_Dxgi_Display.h" />

+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_FocusReader.h" />

+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_ShimFunctions.h" />

     <ClInclude Include="..\..\..\Src\Kernel\OVR_Alg.h" />

     <ClInclude Include="..\..\..\Src\Kernel\OVR_Allocator.h" />

     <ClInclude Include="..\..\..\Src\Kernel\OVR_Array.h" />

     <ClInclude Include="..\..\..\Src\Kernel\OVR_Atomic.h" />

     <ClInclude Include="..\..\..\Src\Kernel\OVR_Color.h" />

+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Compiler.h" />

     <ClInclude Include="..\..\..\Src\Kernel\OVR_ContainerAllocator.h" />

+    <ClInclude Include="..\..\..\Src\Kernel\OVR_CRC32.h" />

+    <ClInclude Include="..\..\..\Src\Kernel\OVR_DebugHelp.h" />

+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Delegates.h" />

+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Deque.h" />

     <ClInclude Include="..\..\..\Src\Kernel\OVR_File.h" />

     <ClInclude Include="..\..\..\Src\Kernel\OVR_Hash.h" />

     <ClInclude Include="..\..\..\Src\Kernel\OVR_KeyCodes.h" />

@@ -44,61 +62,59 @@
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Lockless.h" />

     <ClInclude Include="..\..\..\Src\Kernel\OVR_Log.h" />

     <ClInclude Include="..\..\..\Src\Kernel\OVR_Math.h" />

-    <ClInclude Include="..\..\..\Src\Kernel\OVR_Deque.h" />

+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Nullptr.h" />

     <ClInclude Include="..\..\..\Src\Kernel\OVR_RefCount.h" />

+    <ClInclude Include="..\..\..\Src\Kernel\OVR_SharedMemory.h" />

     <ClInclude Include="..\..\..\Src\Kernel\OVR_Std.h" />

     <ClInclude Include="..\..\..\Src\Kernel\OVR_String.h" />

     <ClInclude Include="..\..\..\Src\Kernel\OVR_StringHash.h" />

     <ClInclude Include="..\..\..\Src\Kernel\OVR_SysFile.h" />

     <ClInclude Include="..\..\..\Src\Kernel\OVR_System.h" />

+    <ClInclude Include="..\..\..\Src\Kernel\OVR_ThreadCommandQueue.h" />

     <ClInclude Include="..\..\..\Src\Kernel\OVR_Threads.h" />

     <ClInclude Include="..\..\..\Src\Kernel\OVR_Timer.h" />

     <ClInclude Include="..\..\..\Src\Kernel\OVR_Types.h" />

     <ClInclude Include="..\..\..\Src\Kernel\OVR_UTF8Util.h" />

+    <ClInclude Include="..\..\..\Src\Net\OVR_BitStream.h" />

+    <ClInclude Include="..\..\..\Src\Net\OVR_NetworkPlugin.h" />

+    <ClInclude Include="..\..\..\Src\Net\OVR_NetworkTypes.h" />

+    <ClInclude Include="..\..\..\Src\Net\OVR_PacketizedTCPSocket.h" />

+    <ClInclude Include="..\..\..\Src\Net\OVR_RPC1.h" />

+    <ClInclude Include="..\..\..\Src\Net\OVR_Session.h" />

+    <ClInclude Include="..\..\..\Src\Net\OVR_Socket.h" />

+    <ClInclude Include="..\..\..\Src\Net\OVR_Win32_Socket.h" />

     <ClInclude Include="..\..\..\Src\OVR_CAPI.h" />

     <ClInclude Include="..\..\..\Src\OVR_CAPI_D3D.h" />

-    <ClInclude Include="..\..\..\Src\OVR_Device.h" />

-    <ClInclude Include="..\..\..\Src\OVR_DeviceConstants.h" />

-    <ClInclude Include="..\..\..\Src\OVR_DeviceHandle.h" />

-    <ClInclude Include="..\..\..\Src\OVR_DeviceImpl.h" />

-    <ClInclude Include="..\..\..\Src\OVR_DeviceMessages.h" />

-    <ClInclude Include="..\..\..\Src\OVR_HIDDevice.h" />

-    <ClInclude Include="..\..\..\Src\OVR_HIDDeviceBase.h" />

-    <ClInclude Include="..\..\..\Src\OVR_HIDDeviceImpl.h" />

+    <ClInclude Include="..\..\..\Src\OVR_CAPI_GL.h" />

     <ClInclude Include="..\..\..\Src\OVR_JSON.h" />

-    <ClInclude Include="..\..\..\Src\OVR_LatencyTestImpl.h" />

     <ClInclude Include="..\..\..\Src\OVR_Profile.h" />

-    <ClInclude Include="..\..\..\Src\OVR_Recording.h" />

-    <ClInclude Include="..\..\..\Src\OVR_RecordingDefs.h" />

-    <ClInclude Include="..\..\..\Src\OVR_Sensor2Impl.h" />

-    <ClInclude Include="..\..\..\Src\OVR_Sensor2ImplUtil.h" />

-    <ClInclude Include="..\..\..\Src\OVR_SensorCalibration.h" />

-    <ClInclude Include="..\..\..\Src\OVR_SensorFilter.h" />

-    <ClInclude Include="..\..\..\Src\OVR_SensorFusion.h" />

-    <ClInclude Include="..\..\..\Src\OVR_SensorImpl.h" />

-    <ClInclude Include="..\..\..\Src\OVR_SensorImpl_Common.h" />

-    <ClInclude Include="..\..\..\Src\OVR_SensorTimeFilter.h" />

+    <ClInclude Include="..\..\..\Src\OVR_SerialFormat.h" />

     <ClInclude Include="..\..\..\Src\OVR_Stereo.h" />

-    <ClInclude Include="..\..\..\Src\OVR_ThreadCommandQueue.h" />

-    <ClInclude Include="..\..\..\Src\OVR_Win32_DeviceManager.h" />

-    <ClInclude Include="..\..\..\Src\OVR_Win32_DeviceStatus.h" />

-    <ClInclude Include="..\..\..\Src\OVR_Win32_HIDDevice.h" />

-    <ClInclude Include="..\..\..\Src\OVR_Win32_HMDDevice.h" />

-    <ClInclude Include="..\..\..\Src\OVR_Win32_SensorDevice.h" />

+    <ClInclude Include="..\..\..\Src\Sensors\OVR_DeviceConstants.h" />

+    <ClInclude Include="..\..\..\Src\Service\Service_NetClient.h" />

+    <ClInclude Include="..\..\..\Src\Service\Service_NetSessionCommon.h" />

+    <ClInclude Include="..\..\..\Src\Tracking\Tracking_PoseState.h" />

+    <ClInclude Include="..\..\..\Src\Tracking\Tracking_SensorState.h" />

+    <ClInclude Include="..\..\..\Src\Tracking\Tracking_SensorStateReader.h" />

     <ClInclude Include="..\..\..\Src\Util\Util_ImageWindow.h" />

     <ClInclude Include="..\..\..\Src\Util\Util_Interface.h" />

-    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest.h" />

-    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2.h" />

+    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2Reader.h" />

+    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2State.h" />

     <ClInclude Include="..\..\..\Src\Util\Util_Render_Stereo.h" />

+    <ClInclude Include="..\..\..\Src\Util\Util_SystemGUI.h" />

+    <ClInclude Include="..\..\..\Src\Util\Util_SystemInfo.h" />

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="..\..\..\Src\CAPI\CAPI_DistortionRenderer.cpp" />

     <ClCompile Include="..\..\..\Src\CAPI\CAPI_FrameTimeManager.cpp" />

-    <ClCompile Include="..\..\..\Src\CAPI\CAPI_GlobalState.cpp" />

     <ClCompile Include="..\..\..\Src\CAPI\CAPI_HMDRenderState.cpp" />

     <ClCompile Include="..\..\..\Src\CAPI\CAPI_HMDState.cpp" />

+    <ClCompile Include="..\..\..\Src\CAPI\CAPI_HSWDisplay.cpp" />

+    <ClCompile Include="..\..\..\Src\CAPI\CAPI_LatencyStatistics.cpp" />

     <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_DistortionRenderer.cpp" />

+    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_HSWDisplay.cpp" />

     <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_DistortionRenderer.cpp" />

+    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_HSWDisplay.cpp" />

     <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_DistortionRenderer.cpp">

       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>

       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>

@@ -111,145 +127,184 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>

       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

     </ClCompile>

-    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D9_DistortionRenderer.cpp" />

-    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D9_Util.cpp" />

+    <ClCompile Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_DistortionRenderer.cpp" />

+    <ClCompile Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_HSWDisplay.cpp" />

+    <ClCompile Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_Util.cpp" />

+    <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GLE.cpp" />

     <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GL_DistortionRenderer.cpp" />

+    <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GL_HSWDisplay.cpp" />

     <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GL_Util.cpp" />

+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_Display.cpp" />

+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_FocusReader.cpp" />

+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_RenderShim.cpp" />

+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_ShimFunctions.cpp" />

     <ClCompile Include="..\..\..\Src\Kernel\OVR_Alg.cpp" />

     <ClCompile Include="..\..\..\Src\Kernel\OVR_Allocator.cpp" />

     <ClCompile Include="..\..\..\Src\Kernel\OVR_Atomic.cpp" />

+    <ClCompile Include="..\..\..\Src\Kernel\OVR_CRC32.cpp" />

+    <ClCompile Include="..\..\..\Src\Kernel\OVR_DebugHelp.cpp" />

     <ClCompile Include="..\..\..\Src\Kernel\OVR_File.cpp" />

     <ClCompile Include="..\..\..\Src\Kernel\OVR_FileFILE.cpp" />

     <ClCompile Include="..\..\..\Src\Kernel\OVR_Lockless.cpp" />

     <ClCompile Include="..\..\..\Src\Kernel\OVR_Log.cpp" />

     <ClCompile Include="..\..\..\Src\Kernel\OVR_Math.cpp" />

     <ClCompile Include="..\..\..\Src\Kernel\OVR_RefCount.cpp" />

+    <ClCompile Include="..\..\..\Src\Kernel\OVR_SharedMemory.cpp" />

     <ClCompile Include="..\..\..\Src\Kernel\OVR_Std.cpp" />

     <ClCompile Include="..\..\..\Src\Kernel\OVR_String.cpp" />

     <ClCompile Include="..\..\..\Src\Kernel\OVR_String_FormatUtil.cpp" />

     <ClCompile Include="..\..\..\Src\Kernel\OVR_String_PathUtil.cpp" />

     <ClCompile Include="..\..\..\Src\Kernel\OVR_SysFile.cpp" />

     <ClCompile Include="..\..\..\Src\Kernel\OVR_System.cpp" />

+    <ClCompile Include="..\..\..\Src\Kernel\OVR_ThreadCommandQueue.cpp" />

     <ClCompile Include="..\..\..\Src\Kernel\OVR_ThreadsWinAPI.cpp" />

     <ClCompile Include="..\..\..\Src\Kernel\OVR_Timer.cpp" />

     <ClCompile Include="..\..\..\Src\Kernel\OVR_UTF8Util.cpp" />

+    <ClCompile Include="..\..\..\Src\Net\OVR_BitStream.cpp" />

+    <ClCompile Include="..\..\..\Src\Net\OVR_NetworkPlugin.cpp" />

+    <ClCompile Include="..\..\..\Src\Net\OVR_PacketizedTCPSocket.cpp" />

+    <ClCompile Include="..\..\..\Src\Net\OVR_RPC1.cpp" />

+    <ClCompile Include="..\..\..\Src\Net\OVR_Session.cpp" />

+    <ClCompile Include="..\..\..\Src\Net\OVR_Socket.cpp" />

+    <ClCompile Include="..\..\..\Src\Net\OVR_Win32_Socket.cpp" />

     <ClCompile Include="..\..\..\Src\OVR_CAPI.cpp" />

-    <ClCompile Include="..\..\..\Src\OVR_DeviceHandle.cpp" />

-    <ClCompile Include="..\..\..\Src\OVR_DeviceImpl.cpp" />

     <ClCompile Include="..\..\..\Src\OVR_JSON.cpp" />

-    <ClCompile Include="..\..\..\Src\OVR_LatencyTestImpl.cpp" />

     <ClCompile Include="..\..\..\Src\OVR_Profile.cpp" />

-    <ClCompile Include="..\..\..\Src\OVR_Recording.cpp" />

-    <ClCompile Include="..\..\..\Src\OVR_Sensor2Impl.cpp" />

-    <ClCompile Include="..\..\..\Src\OVR_SensorCalibration.cpp" />

-    <ClCompile Include="..\..\..\Src\OVR_SensorFilter.cpp" />

-    <ClCompile Include="..\..\..\Src\OVR_SensorFusion.cpp" />

-    <ClCompile Include="..\..\..\Src\OVR_SensorImpl.cpp" />

-    <ClCompile Include="..\..\..\Src\OVR_SensorImpl_Common.cpp" />

-    <ClCompile Include="..\..\..\Src\OVR_SensorTimeFilter.cpp" />

+    <ClCompile Include="..\..\..\Src\OVR_SerialFormat.cpp" />

     <ClCompile Include="..\..\..\Src\OVR_Stereo.cpp" />

-    <ClCompile Include="..\..\..\Src\OVR_ThreadCommandQueue.cpp" />

-    <ClCompile Include="..\..\..\Src\OVR_Win32_DeviceManager.cpp" />

-    <ClCompile Include="..\..\..\Src\OVR_Win32_DeviceStatus.cpp" />

-    <ClCompile Include="..\..\..\Src\OVR_Win32_HIDDevice.cpp" />

-    <ClCompile Include="..\..\..\Src\OVR_Win32_HMDDevice.cpp" />

-    <ClCompile Include="..\..\..\Src\OVR_Win32_SensorDevice.cpp" />

+    <ClCompile Include="..\..\..\Src\Service\Service_NetClient.cpp" />

+    <ClCompile Include="..\..\..\Src\Service\Service_NetSessionCommon.cpp" />

+    <ClCompile Include="..\..\..\Src\Tracking\Tracking_SensorStateReader.cpp" />

     <ClCompile Include="..\..\..\Src\Util\Util_ImageWindow.cpp" />

     <ClCompile Include="..\..\..\Src\Util\Util_Interface.cpp" />

-    <ClCompile Include="..\..\..\Src\Util\Util_LatencyTest.cpp" />

-    <ClCompile Include="..\..\..\Src\Util\Util_LatencyTest2.cpp" />

+    <ClCompile Include="..\..\..\Src\Util\Util_LatencyTest2Reader.cpp" />

     <ClCompile Include="..\..\..\Src\Util\Util_Render_Stereo.cpp" />

+    <ClCompile Include="..\..\..\Src\Util\Util_SystemGUI.cpp" />

+    <ClCompile Include="..\..\..\Src\Util\Util_SystemInfo.cpp" />

   </ItemGroup>

   <ItemGroup>

-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionChroma_ps.psh">

+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionChroma_ps.psh">

       <FileType>Document</FileType>

-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>

-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>

       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>

-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

     </CustomBuild>

-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionChroma_vs.vsh">

+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionChroma_vs.vsh">

       <FileType>Document</FileType>

-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>

-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>

       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>

-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>

-    </CustomBuild>

-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionTimewarpChroma_vs.vsh">

-      <FileType>Document</FileType>

       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>

       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>

+    </CustomBuild>

+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionTimewarpChroma_vs.vsh">

+      <FileType>Document</FileType>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>

       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

     </CustomBuild>

-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionTimewarp_vs.vsh">

+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionTimewarp_vs.vsh">

       <FileType>Document</FileType>

-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>

-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>

       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>

-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

     </CustomBuild>

-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\Distortion_ps.psh">

+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\Distortion_ps.psh">

       <FileType>Document</FileType>

-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>

-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>

       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+    </CustomBuild>

+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\Distortion_vs.vsh">

+      <FileType>Document</FileType>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

     </CustomBuild>

-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\Distortion_vs.vsh">

+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleQuad_ps.psh">

       <FileType>Document</FileType>

-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>

-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+    </CustomBuild>

+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleQuad_vs.vsh">

+      <FileType>Document</FileType>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>

       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

     </CustomBuild>

-  </ItemGroup>

-  <ItemGroup>

-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\SimpleQuad_ps.psh">

+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleTexturedQuad_ps.psh">

       <FileType>Document</FileType>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>

-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>

-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>

     </CustomBuild>

-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\SimpleQuad_vs.vsh">

+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleTexturedQuad_vs.vsh">

       <FileType>Document</FileType>

-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>

-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+    </CustomBuild>

+  </ItemGroup>

+  <ItemGroup>

+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionCS2x2.csh">

+      <FileType>Document</FileType>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genComputeShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genComputeShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genComputeShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genComputeShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>

-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>

     </CustomBuild>

   </ItemGroup>

   <PropertyGroup Label="Globals">