Upgrade LibOVR to 1.7.0.

dependencies/VERSIONS.txt

@@ -1,6 +1,6 @@
 gflags: 2.1.2
 giflib: 5.1.0
-libovr: 1.6.0
+libovr: 1.7.0
 libwebm: 852e173
 libvpx: 1.3.0
 protobuf: 3.0.0-beta-1

dependencies/include/libovr/OVR_CAPI_Audio.h

@@ -17,6 +17,8 @@
 #include "OVR_CAPI.h"
 #define OVR_AUDIO_MAX_DEVICE_STR_SIZE 128
 
+#if !defined(OVR_EXPORTING_CAPI)
+
 /// Gets the ID of the preferred VR audio output device.
 ///
 /// \param[out] deviceOutId The ID of the user's preferred VR audio device to use, which will be valid upon a successful return value, else it will be WAVE_MAPPER.
@@ -75,6 +77,8 @@ OVR_PUBLIC_FUNCTION(ovrResult) ovr_GetAudioDeviceInGuidStr(WCHAR deviceInStrBuff
 ///
 OVR_PUBLIC_FUNCTION(ovrResult) ovr_GetAudioDeviceInGuid(GUID* deviceInGuid);
 
+#endif // !defined(OVR_EXPORTING_CAPI)
+
 #endif //OVR_OS_MS
 
 #endif    // OVR_CAPI_Audio_h

dependencies/include/libovr/OVR_CAPI_D3D.h

@@ -14,6 +14,8 @@
 #if defined (_WIN32)
 #include <Unknwn.h>
 
+#if !defined(OVR_EXPORTING_CAPI)
+
 //-----------------------------------------------------------------------------------
 // ***** Direct3D Specific
 
@@ -149,6 +151,7 @@ OVR_PUBLIC_FUNCTION(ovrResult) ovr_GetMirrorTextureBufferDX(ovrSession session,
                                                             IID iid,
                                                             void** out_Buffer);
 
+#endif // !defined(OVR_EXPORTING_CAPI)
 
 #endif // _WIN32
 

dependencies/include/libovr/OVR_CAPI_GL.h

@@ -9,6 +9,8 @@
 
 #include "OVR_CAPI.h"
 
+#if !defined(OVR_EXPORTING_CAPI)
+
 /// Creates a TextureSwapChain suitable for use with OpenGL.
 ///
 /// \param[in]  session Specifies an ovrSession previously returned by ovr_Create.
@@ -95,5 +97,6 @@ OVR_PUBLIC_FUNCTION(ovrResult) ovr_GetMirrorTextureBufferGL(ovrSession session,
                                                             ovrMirrorTexture mirrorTexture,
                                                             unsigned int* out_TexId);
 
+#endif // !defined(OVR_EXPORTING_CAPI)
 
 #endif    // OVR_CAPI_GL_h

dependencies/include/libovr/OVR_ErrorCode.h

@@ -88,6 +88,7 @@ typedef enum ovrErrorType_
     ovrError_ClientSkippedDestroy       = -1012,   ///< The client failed to call ovr_Destroy on an active session before calling ovr_Shutdown. Or the client crashed.
     ovrError_ClientSkippedShutdown      = -1013,   ///< The client failed to call ovr_Shutdown or the client crashed.
     ovrError_ServiceDeadlockDetected    = -1014,   ///< The service watchdog discovered a deadlock.
+    ovrError_InvalidOperation           = -1015,   ///< Function call is invalid for object's current state
 
     /* Audio error range, reserved for Audio errors. */
     ovrError_AudioDeviceNotFound        = -2001,   ///< Failure to find the specified audio device.
@@ -115,6 +116,9 @@ typedef enum ovrErrorType_
     ovrError_HybridGraphicsNotSupported = -3018,   ///< The system is using hybrid graphics (Optimus, etc...), which is not support.
     ovrError_DisplayManagerInit         = -3019,   ///< Initialization of the DisplayManager failed.
     ovrError_TrackerDriverInit          = -3020,   ///< Failed to get the interface for an attached tracker
+    ovrError_LibSignCheck               = -3021,   ///< LibOVRRT signature check failure.
+    ovrError_LibPath                    = -3022,   ///< LibOVRRT path failure.
+    ovrError_LibSymbols                 = -3023,   ///< LibOVRRT symbol resolution failure.
 
     /* Rendering errors */
     ovrError_DisplayLost                = -6000,   ///< In the event of a system-wide graphics reset or cable unplug this is returned to the app.
@@ -130,6 +134,11 @@ typedef enum ovrErrorType_
     /* Fatal errors */
     ovrError_RuntimeException           = -7000,   ///< A runtime exception occurred. The application is required to shutdown LibOVR and re-initialize it before this error state will be cleared.
 
+    /* Calibration errors */
+    ovrError_NoCalibration              = -9000,   ///< Result of a missing calibration block
+    ovrError_OldVersion                 = -9001,   ///< Result of an old calibration block
+    ovrError_MisformattedBlock          = -9002,   ///< Result of a bad calibration block due to lengths
+
 
 } ovrErrorType;
 

dependencies/include/libovr/OVR_Version.h

@@ -19,7 +19,7 @@
 // Master version numbers
 #define OVR_PRODUCT_VERSION 1  // Product version doesn't participate in semantic versioning.
 #define OVR_MAJOR_VERSION   1  // If you change these values then you need to also make sure to change LibOVR/Projects/Windows/LibOVR.props in parallel.
-#define OVR_MINOR_VERSION   6  // 
+#define OVR_MINOR_VERSION   7  // 
 #define OVR_PATCH_VERSION   0
 #define OVR_BUILD_NUMBER    0