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/Displays/OVR_Win32_ShimVersion.h | |
| 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/Displays/OVR_Win32_ShimVersion.h')
| -rw-r--r-- | LibOVR/Src/Displays/OVR_Win32_ShimVersion.h | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/LibOVR/Src/Displays/OVR_Win32_ShimVersion.h b/LibOVR/Src/Displays/OVR_Win32_ShimVersion.h new file mode 100644 index 0000000..f5eaa7c --- /dev/null +++ b/LibOVR/Src/Displays/OVR_Win32_ShimVersion.h @@ -0,0 +1,47 @@ +/************************************************************************************
+
+Filename : OVR_Win32_ShimVersion.h
+Content : Versioning info for our display shim
+Created : Nov 4, 2014
+Authors : Scott Bassett
+
+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.
+
+*************************************************************************************/
+
+#define STRINGIZE_(x) #x
+#define STRINGIZE(x) STRINGIZE_(x)
+
+#define OVR_MAKE_VERSION(major, minor, patch) (ULONG)(((major) << 24) | ((minor) << 16) | patch)
+#define OVR_GET_VERSION_MAJOR(x) (ULONG)(((x) >> 24) & 0x000000FF)
+#define OVR_GET_VERSION_MINOR(x) (ULONG)(((x) >> 16) & 0x000000FF)
+#define OVR_GET_VERSION_PATCH(x) (ULONG)((x) & 0x0000FFFF)
+
+#define OVR_RENDER_SHIM_VERSION_MAJOR 1
+#define OVR_RENDER_SHIM_VERSION_MINOR 0
+#define OVR_RENDER_SHIM_VERSION_PATCH 0
+#define OVR_RENDER_SHIM_VERSION OVR_MAKE_VERSION(OVR_RENDER_SHIM_VERSION_MAJOR, OVR_RENDER_SHIM_VERSION_MINOR, OVR_RENDER_SHIM_VERSION_PATCH)
+#define OVR_RENDER_SHIM_VERSION_STRING (STRINGIZE(OVR_RENDER_SHIM_VERSION_MAJOR) "." STRINGIZE(OVR_RENDER_SHIM_VERSION_MINOR) "." STRINGIZE(OVR_RENDER_SHIM_VERSION_PATCH))
+
+// IF YOU CHANGE ANY OF THESE NUMBERS YOU MUST UPDATE MULTIPLE FILES.
+// PLEASE LOOK AT CHANGELIST 31947 TO SEE THE FULL LIST.
+#define OVR_RTFILTER_VERSION_MAJOR 1
+#define OVR_RTFILTER_VERSION_MINOR 2
+#define OVR_RTFILTER_VERSION_PATCH 2
+#define OVR_RTFILTER_VERSION OVR_MAKE_VERSION(OVR_RTFILTER_VERSION_MAJOR, OVR_RTFILTER_VERSION_MINOR, OVR_RTFILTER_VERSION_PATCH)
+#define OVR_RTFILTER_VERSION_STRING (STRINGIZE(OVR_RTFILTER_VERSION_MAJOR) "." STRINGIZE(OVR_RTFILTER_VERSION_MINOR) "." STRINGIZE(OVR_RTFILTER_VERSION_PATCH))
|