diff options
| author | Sven Gothel <[email protected]> | 2015-03-21 23:01:12 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-03-21 23:01:12 +0100 |
| commit | 0c5c4be020c2d55540058a49b2a879f46d5a1e13 (patch) | |
| tree | 00f84c2ca18cc233b826014094b9cad0769a3ea5 /LibOVR/Src/CAPI/D3D1X/Shaders/SimpleQuad_vs.vsh | |
| parent | cbbd775b6c754927632c333ff01424a0d2048c7c (diff) | |
| parent | e490c3c7f7bb5461cfa78a214827aa534fb43a3e (diff) | |
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
Diffstat (limited to 'LibOVR/Src/CAPI/D3D1X/Shaders/SimpleQuad_vs.vsh')
| -rw-r--r-- | LibOVR/Src/CAPI/D3D1X/Shaders/SimpleQuad_vs.vsh | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/LibOVR/Src/CAPI/D3D1X/Shaders/SimpleQuad_vs.vsh b/LibOVR/Src/CAPI/D3D1X/Shaders/SimpleQuad_vs.vsh new file mode 100644 index 0000000..94d6694 --- /dev/null +++ b/LibOVR/Src/CAPI/D3D1X/Shaders/SimpleQuad_vs.vsh @@ -0,0 +1,31 @@ +/************************************************************************************
+
+Filename : SimplaeQuad_vs.vsh
+
+Copyright : Copyright 2014 Oculus VR, LLC All Rights reserved.
+
+Licensed under the Oculus VR Rift SDK License Version 3.2 (the "License");
+you may not use the Oculus VR Rift SDK except in compliance with the License,
+which is provided at the time of installation or download, or which
+otherwise accompanies this software in either electronic or hard copy form.
+
+You may obtain a copy of the License at
+
+http://www.oculusvr.com/licenses/LICENSE-3.2
+
+Unless required by applicable law or agreed to in writing, the Oculus VR SDK
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+************************************************************************************/
+
+float2 PositionOffset = float2(0, 0);
+float2 Scale = float2(1, 1);
+
+void main( in float3 Position : POSITION,
+out float4 oPosition : SV_Position)
+{
+ oPosition = float4(Position.xy * Scale + PositionOffset, 0.5, 1.0);
+}
\ No newline at end of file |