OpenVR SDK 1.0.2:

General:
* Split several VR_Init error return values out into unique causes.
* Added Prop_ControllerRoleHint_Int32, which a controller driver can optionally use to return the best matching ETrackedControllerRole type for the controller. Use this to specify a controller that is physically shaped for one hand only or when the driver is able to determine which hand is holding the controller through sensors or other means.
* Added VREvent_OverlayFocusChanged, which is sent when an overlay was under the laser mouse and isn’t anymore or when there was no overlay under the laser mouse and now there is.


IVRApplications:
* Added LaunchApplicationFromMimeType. This allows the caller (usually Steam) to start the application that is associated with that mime type if it is not already running. If the application is not running it will be started with the specified arguments appended to existing arguments for the app. If the application is already running it will receive VREvent_ApplicationMimeTypeLoad and can retrieve the arguments by passing event.applicationLaunch.unArgsHandle to IVRApplications:: GetApplicationLaunchArguments.
* Added other support functions for mime types.

IVRCompositor:
* Split out Compositor_FrameTiming's m_flSceneRenderGpuMs into m_flPreSubmitGpuMs and m_flPostSubmitGpuMs.  Post-Submit time was not previously being recorded.

IVROverlay:
* Added VROverlayFlags_SortWithNonSceneOverlays. This allows the scene application's overlays to sort with other non-scene overlays.
* Added SetOverlayTexelAspect/GetOverlayTexelAspect. This allows an overlay to control the aspect ratio of its texels. By default all overlay texels are square (i.e. 1.0)
* Added SetOverlaySortOrder/GetOverlaySortOrder. This allows an overlay to be force to be sorted above or below other overlays. It is most useful for overlays from the scene application that want to explicitly control their draw order.


IVRTrackedCamera:
* Added accessors to work with tracked camera gpu resources:
** GetVideoStreamTextureSize
** GetVideoStreamTextureD3D11
** GetVideoStreamTextureGL
** ReleaseVideoStreamTextureGL

IVRResources:
* New interface to allow access to resource files in the runtime or user-installed drivers.


IVRCameraComponent:
* Simplified interface by removing duplicate functions already provided by properties and deprecating the arbitrary distortion methods.


IClientDriverHost:
* Added WatchdogWakeUp. When a client driver is in Watchdog mode it should call this if a hardware event happens that should cause the system to wake up. The Lighthouse driver, for instance, calls this method when a system button is pressed or a controller is turned on.

IClientTrackedDeviceProvider:
* Added eDriverMode argument to Init. When this is passed as ClientDriverMode_Watchdog the driver should enter a low-power state where hardware is being monitored. If the driver does not support watchdog mode it should return VRInitError_Init_LowPowerWatchdogNotSupported.

[git-p4: depot-paths = "//vr/steamvr/sdk_release/": change = 3525698]

Author: JoeLudwig

bin/linux64/libopenvr_api.so

@@ -277,6 +277,7 @@ enum ETrackedDeviceProperty
 	Prop_Axis2Type_Int32						= 3004, // Return value is of type EVRControllerAxisType
 	Prop_Axis3Type_Int32						= 3005, // Return value is of type EVRControllerAxisType
 	Prop_Axis4Type_Int32						= 3006, // Return value is of type EVRControllerAxisType
+	Prop_ControllerRoleHint_Int32				= 3007, // Return value is of type ETrackedControllerRole
 
 	// Properties that are unique to TrackedDeviceClass_TrackingReference
 	Prop_FieldOfViewLeftDegrees_Float			= 4000,
@@ -346,6 +347,7 @@ enum EVRState
 	VRState_Ready_Alert = 4,
 	VRState_NotReady = 5,
 	VRState_Standby = 6,
+	VRState_Ready_Alert_Low = 7,
 };
 
 /** The types of events that could be posted (and what the parameters mean for each event type) */
@@ -362,6 +364,7 @@ enum EVREventType
 	VREvent_EnterStandbyMode			= 106,
 	VREvent_LeaveStandbyMode			= 107,
 	VREvent_TrackedDeviceRoleChanged	= 108,
+	VREvent_WatchdogWakeUpRequested		= 109,
 
 	VREvent_ButtonPress					= 200, // data is controller
 	VREvent_ButtonUnpress				= 201, // data is controller
@@ -375,6 +378,7 @@ enum EVREventType
 	VREvent_FocusLeave					= 304, // data is overlay
 	VREvent_Scroll						= 305, // data is mouse
 	VREvent_TouchPadMove				= 306, // data is mouse
+	VREvent_OverlayFocusChanged			= 307, // data is overlay, global event
 
 	VREvent_InputFocusCaptured			= 400, // data is process DEPRECATED
 	VREvent_InputFocusReleased			= 401, // data is process DEPRECATED
@@ -412,6 +416,7 @@ enum EVREventType
 	VREvent_ScreenshotTaken = 521, // Sent by compositor to the application that the screenshot has been taken
 	VREvent_ScreenshotFailed = 522, // Sent by compositor to the application that the screenshot failed to be taken
 	VREvent_SubmitScreenshotToDashboard = 523, // Sent by compositor to the dashboard that a completed screenshot was submitted
+	VREvent_ScreenshotProgressToDashboard = 524, // Sent by compositor to the dashboard that a completed screenshot was submitted
 
 	VREvent_Notification_Shown				= 600,
 	VREvent_Notification_Hidden				= 601,
@@ -453,6 +458,7 @@ enum EVREventType
 	VREvent_ApplicationTransitionAborted	= 1301,
 	VREvent_ApplicationTransitionNewAppStarted = 1302,
 	VREvent_ApplicationListUpdated			= 1303,
+	VREvent_ApplicationMimeTypeLoad			= 1304,
 
 	VREvent_Compositor_MirrorWindowShown	= 1400,
 	VREvent_Compositor_MirrorWindowHidden	= 1401,
@@ -634,6 +640,17 @@ struct VREvent_Screenshot_t
 	uint32_t type;
 };
 
+struct VREvent_ScreenshotProgress_t
+{
+	float progress;
+};
+
+struct VREvent_ApplicationLaunch_t
+{
+	uint32_t pid;
+	uint32_t unArgsHandle;
+};
+
 /** If you change this you must manually update openvr_interop.cs.py */
 typedef union
 {
@@ -652,6 +669,8 @@ typedef union
 	VREvent_TouchPadMove_t touchPadMove;
 	VREvent_SeatedZeroPoseReset_t seatedZeroPoseReset;
 	VREvent_Screenshot_t screenshot;
+	VREvent_ScreenshotProgress_t screenshotProgress;
+	VREvent_ApplicationLaunch_t applicationLaunch;
 } VREvent_Data_t;
 
 /** An event posted by the server to all running applications */
@@ -795,6 +814,9 @@ enum EVRApplicationType
 	VRApplication_Utility = 4,		// Init should not try to load any drivers. The application needs access to utility
 									// interfaces (like IVRSettings and IVRApplications) but not hardware.
 	VRApplication_VRMonitor = 5,	// Reserved for vrmonitor
+	VRApplication_SteamWatchdog = 6,// Reserved for Steam
+
+	VRApplication_Max
 };
 
 
@@ -851,6 +873,14 @@ enum EVRInitError
 	VRInitError_Init_NotSupportedWithCompositor	= 122,
 	VRInitError_Init_NotAvailableToUtilityApps	= 123,
 	VRInitError_Init_Internal				 	= 124,
+	VRInitError_Init_HmdDriverIdIsNone		 	= 125,
+	VRInitError_Init_HmdNotFoundPresenceFailed 	= 126,
+	VRInitError_Init_VRMonitorNotFound			= 127,
+	VRInitError_Init_VRMonitorStartupFailed		= 128,
+	VRInitError_Init_LowPowerWatchdogNotSupported = 129, 
+	VRInitError_Init_InvalidApplicationType		= 130,
+	VRInitError_Init_NotAvailableToWatchdogApps = 131,
+	VRInitError_Init_WatchdogDisabledInSettings = 132,
 
 	VRInitError_Driver_Failed				= 200,
 	VRInitError_Driver_Unknown				= 201,
@@ -861,13 +891,20 @@ enum EVRInitError
 	VRInitError_Driver_NotCalibrated		= 206,
 	VRInitError_Driver_CalibrationInvalid	= 207,
 	VRInitError_Driver_HmdDisplayNotFound	= 208,
-	
+	VRInitError_Driver_TrackedDeviceInterfaceUnknown = 209,
+	// VRInitError_Driver_HmdDisplayNotFoundAfterFix	 = 210, // not needed: here for historic reasons
+	VRInitError_Driver_HmdDriverIdOutOfBounds = 211,
+	VRInitError_Driver_HmdDisplayMirrored  = 212,
+
 	VRInitError_IPC_ServerInitFailed		= 300,
 	VRInitError_IPC_ConnectFailed			= 301,
 	VRInitError_IPC_SharedStateInitFailed	= 302,
 	VRInitError_IPC_CompositorInitFailed	= 303,
 	VRInitError_IPC_MutexInitFailed			= 304,
 	VRInitError_IPC_Failed					= 305,
+	VRInitError_IPC_CompositorConnectFailed	= 306,
+	VRInitError_IPC_CompositorInvalidConnectResponse = 307,
+	VRInitError_IPC_ConnectFailedAfterMultipleAttempts = 308,
 
 	VRInitError_Compositor_Failed					= 400,
 	VRInitError_Compositor_D3D11HardwareRequired	= 401,
@@ -971,7 +1008,7 @@ static const uint32_t k_unScreenshotHandleInvalid = 0;
 #define VR_INTERFACE extern "C" __declspec( dllimport )
 #endif
 
-#elif defined(GNUC) || defined(COMPILER_GCC) || defined(__APPLE__)
+#elif defined(__GNUC__) || defined(COMPILER_GCC) || defined(__APPLE__)
 
 #ifdef VR_API_EXPORT
 #define VR_INTERFACE extern "C" __attribute__((visibility("default")))
@@ -995,6 +1032,25 @@ static const uint32_t k_unScreenshotHandleInvalid = 0;
 #endif // _INCLUDE_VRTYPES_H
 
 
+// vrannotation.h
+#ifdef API_GEN
+# define VR_CLANG_ATTR(ATTR) __attribute__((annotate( ATTR )))
+#else
+# define VR_CLANG_ATTR(ATTR)
+#endif
+
+#define VR_METHOD_DESC(DESC) VR_CLANG_ATTR( "desc:" #DESC ";" )
+#define VR_IGNOREATTR() VR_CLANG_ATTR( "ignore" )
+#define VR_OUT_STRUCT() VR_CLANG_ATTR( "out_struct: ;" )
+#define VR_OUT_STRING() VR_CLANG_ATTR( "out_string: ;" )
+#define VR_OUT_ARRAY_CALL(COUNTER,FUNCTION,PARAMS) VR_CLANG_ATTR( "out_array_call:" #COUNTER "," #FUNCTION "," #PARAMS ";" )
+#define VR_OUT_ARRAY_COUNT(COUNTER) VR_CLANG_ATTR( "out_array_count:" #COUNTER ";" )
+#define VR_ARRAY_COUNT(COUNTER) VR_CLANG_ATTR( "array_count:" #COUNTER ";" )
+#define VR_ARRAY_COUNT_D(COUNTER, DESC) VR_CLANG_ATTR( "array_count:" #COUNTER ";desc:" #DESC )
+#define VR_BUFFER_COUNT(COUNTER) VR_CLANG_ATTR( "buffer_count:" #COUNTER ";" )
+#define VR_OUT_BUFFER_COUNT(COUNTER) VR_CLANG_ATTR( "out_buffer_count:" #COUNTER ";" )
+#define VR_OUT_STRING_COUNT(COUNTER) VR_CLANG_ATTR( "out_string_count:" #COUNTER ";" )
+
 // vrtrackedcameratypes.h
 #ifndef _VRTRACKEDCAMERATYPES_H
 #define _VRTRACKEDCAMERATYPES_H 
@@ -1121,7 +1177,7 @@ namespace vr
 		virtual void SetInt32( const char *pchSection, const char *pchSettingsKey, int32_t nValue, EVRSettingsError *peError = nullptr ) = 0;
 		virtual float GetFloat( const char *pchSection, const char *pchSettingsKey, float flDefaultValue, EVRSettingsError *peError = nullptr ) = 0;
 		virtual void SetFloat( const char *pchSection, const char *pchSettingsKey, float flValue, EVRSettingsError *peError = nullptr ) = 0;
-		virtual void GetString( const char *pchSection, const char *pchSettingsKey, char *pchValue, uint32_t unValueLen, const char *pchDefaultValue, EVRSettingsError *peError = nullptr ) = 0;
+		virtual void GetString( const char *pchSection, const char *pchSettingsKey, VR_OUT_STRING() char *pchValue, uint32_t unValueLen, const char *pchDefaultValue, EVRSettingsError *peError = nullptr ) = 0;
 		virtual void SetString( const char *pchSection, const char *pchSettingsKey, const char *pchValue, EVRSettingsError *peError = nullptr ) = 0;
 
 		virtual void RemoveSection( const char *pchSection, EVRSettingsError *peError = nullptr ) = 0;
@@ -1170,6 +1226,10 @@ namespace vr
 	static const char * const k_pch_SteamVR_ForceFadeOnBadTracking_Bool = "forceFadeOnBadTracking";
 	static const char * const k_pch_SteamVR_DefaultMirrorView_Int32 = "defaultMirrorView";
 	static const char * const k_pch_SteamVR_ShowMirrorView_Bool = "showMirrorView";
+	static const char * const k_pch_SteamVR_StartMonitorFromAppLaunch = "startMonitorFromAppLaunch";
+	static const char * const k_pch_SteamVR_AutoLaunchSteamVROnButtonPress = "autoLaunchSteamVROnButtonPress";
+	static const char * const k_pch_SteamVR_UseGenericGraphcisDevice_Bool = "useGenericGraphicsDevice";
+
 
 	//-----------------------------------------------------------------------------
 	// lighthouse keys
@@ -1205,7 +1265,8 @@ namespace vr
 	// user interface keys
 	static const char * const k_pch_UserInterface_Section = "userinterface";
 	static const char * const k_pch_UserInterface_StatusAlwaysOnTop_Bool = "StatusAlwaysOnTop";
-	static const char * const k_pch_UserInterface_EnableScreenshots_Bool = "EnableScreenshots";
+	static const char * const k_pch_UserInterface_Screenshots_Bool = "screenshots";
+	static const char * const k_pch_UserInterface_ScreenshotType_Int = "screenshotType";
 
 	//-----------------------------------------------------------------------------
 	// notification keys
@@ -1543,7 +1604,6 @@ namespace vr
 // ivrcameracomponent.h
 namespace vr
 {
-
 	//-----------------------------------------------------------------------------
 	//-----------------------------------------------------------------------------
 	class ICameraVideoSinkCallback
@@ -1561,28 +1621,21 @@ namespace vr
 		// ------------------------------------
 		// Camera Methods
 		// ------------------------------------
-		virtual bool HasCamera() = 0;
-		virtual bool GetCameraFirmwareDescription( char *pBuffer, uint32_t nBufferLen ) = 0;
 		virtual bool GetCameraFrameDimensions( vr::ECameraVideoStreamFormat nVideoStreamFormat, uint32_t *pWidth, uint32_t *pHeight ) = 0;
 		virtual bool GetCameraFrameBufferingRequirements( int *pDefaultFrameQueueSize, uint32_t *pFrameBufferDataSize ) = 0;
 		virtual bool SetCameraFrameBuffering( int nFrameBufferCount, void **ppFrameBuffers, uint32_t nFrameBufferDataSize ) = 0;
 		virtual bool SetCameraVideoStreamFormat( vr::ECameraVideoStreamFormat nVideoStreamFormat ) = 0;
 		virtual vr::ECameraVideoStreamFormat GetCameraVideoStreamFormat() = 0;
 		virtual bool StartVideoStream() = 0;
 		virtual void StopVideoStream() = 0;
-		virtual bool IsVideoStreamActive() = 0;
-		virtual float GetVideoStreamElapsedTime() = 0;
+		virtual bool IsVideoStreamActive( bool *pbPaused, float *pflElapsedTime ) = 0;
 		virtual const vr::CameraVideoStreamFrame_t *GetVideoStreamFrame() = 0;
 		virtual void ReleaseVideoStreamFrame( const vr::CameraVideoStreamFrame_t *pFrameImage ) = 0;
 		virtual bool SetAutoExposure( bool bEnable ) = 0;
 		virtual bool PauseVideoStream() = 0;
 		virtual bool ResumeVideoStream() = 0;
-		virtual bool IsVideoStreamPaused() = 0;
 		virtual bool GetCameraDistortion( float flInputU, float flInputV, float *pflOutputU, float *pflOutputV ) = 0;
-		virtual bool GetCameraProjection( float flWidthPixels, float flHeightPixels, float flZNear, float flZFar, vr::HmdMatrix44_t *pProjection ) = 0;
-		virtual bool GetRecommendedCameraUndistortion( uint32_t *pUndistortionWidthPixels, uint32_t *pUndistortionHeightPixels ) = 0;
-		virtual bool SetCameraUndistortion( uint32_t nUndistortionWidthPixels, uint32_t nUndistortionHeightPixels ) = 0;
-		virtual bool GetCameraFirmwareVersion( uint64_t *pFirmwareVersion ) = 0;
+		virtual bool GetCameraProjection( vr::EVRTrackedCameraFrameType eFrameType, float flZNear, float flZFar, vr::HmdMatrix44_t *pProjection ) = 0;
 		virtual bool SetFrameRate( int nISPFrameRate, int nSensorFrameRate ) = 0;
 		virtual bool SetCameraVideoSinkCallback( vr::ICameraVideoSinkCallback *pCameraVideoSinkCallback ) = 0;
 		virtual bool GetCameraCompatibilityMode( vr::ECameraCompatibilityMode *pCameraCompatibilityMode ) = 0;
@@ -1591,7 +1644,7 @@ namespace vr
 		virtual bool GetCameraIntrinsics( vr::EVRTrackedCameraFrameType eFrameType, HmdVector2_t *pFocalLength, HmdVector2_t *pCenter ) = 0;
 	};
 
-	static const char *IVRCameraComponent_Version = "IVRCameraComponent_001";
+	static const char *IVRCameraComponent_Version = "IVRCameraComponent_002";
 }
 // itrackeddevicedriverprovider.h
 namespace vr
@@ -1754,9 +1807,20 @@ class IClientDriverHost
 
 	/** always returns a pointer to a valid interface pointer of IVRSettings */
 	virtual IVRSettings *GetSettings( const char *pchInterfaceVersion ) = 0; 
+
+	/** Client drivers in watchdog mode should call this when they have received a signal from hardware that should
+	* cause SteamVR to start */
+	virtual void WatchdogWakeUp() = 0;
 };
 
 
+/** Defines the mode that the client driver should start in. */
+enum EClientDriverMode
+{
+	ClientDriverMode_Normal = 0,
+	ClientDriverMode_Watchdog = 1, // client should return VRInitError_Init_LowPowerWatchdogNotSupported if it can't support this mode
+};
+
 
 /** This interface must be implemented in each driver. It will be loaded in vrclient.dll */
 class IClientTrackedDeviceProvider
@@ -1772,7 +1836,7 @@ class IClientTrackedDeviceProvider
 	*	config files.
 	* pchDriverInstallDir - The absolute path of the root directory for the driver.
 	*/
-	virtual EVRInitError Init( IDriverLog *pDriverLog, vr::IClientDriverHost *pDriverHost, const char *pchUserDriverConfigDir, const char *pchDriverInstallDir ) = 0;
+	virtual EVRInitError Init( EClientDriverMode eDriverMode, IDriverLog *pDriverLog, vr::IClientDriverHost *pDriverHost, const char *pchUserDriverConfigDir, const char *pchDriverInstallDir ) = 0;
 
 	/** cleans up the driver right before it is unloaded */
 	virtual void Cleanup() = 0;
@@ -1800,7 +1864,7 @@ class IClientTrackedDeviceProvider
 	virtual uint32_t GetMCImage( uint32_t *pImgWidth, uint32_t *pImgHeight, uint32_t *pChannels, void *pDataBuffer, uint32_t unBufferLen ) = 0;
 };
 
-static const char *IClientTrackedDeviceProvider_Version = "IClientTrackedDeviceProvider_003";
+static const char *IClientTrackedDeviceProvider_Version = "IClientTrackedDeviceProvider_004";
 
 }
 

bin/linux64/libopenvr_api.so.dbg

@@ -4,6 +4,12 @@
 #include "driverlog.h"
 
 #include <vector>
+#include <thread>
+#include <chrono>
+
+#if defined( _WINDOWS )
+#include <Windows.h>
+#endif
 
 using namespace vr;
 
@@ -70,33 +76,61 @@ class CClientDriver_Sample : public IClientTrackedDeviceProvider
 		: m_bEnableNullDriver( false )
 		, m_bInit( false )
 	{
+		m_eDriverMode = ClientDriverMode_Normal;
+		m_pWatchdogThread = nullptr;
 	}
 
-	virtual EVRInitError Init( vr::IDriverLog *pDriverLog, vr::IClientDriverHost *pDriverHost, const char *pchUserDriverConfigDir, const char *pchDriverInstallDir ) ;
+	virtual EVRInitError Init( vr::EClientDriverMode eDriverMode, vr::IDriverLog *pDriverLog, vr::IClientDriverHost *pDriverHost, const char *pchUserDriverConfigDir, const char *pchDriverInstallDir ) ;
 	virtual void Cleanup() ;
 	virtual bool BIsHmdPresent( const char *pchUserDriverConfigDir ) ;
 	virtual EVRInitError SetDisplayId( const char *pchDisplayId )  { return VRInitError_None; } // Null doesn't care
 	virtual HiddenAreaMesh_t GetHiddenAreaMesh( EVREye eEye ) ;
 	virtual uint32_t GetMCImage( uint32_t *pImgWidth, uint32_t *pImgHeight, uint32_t *pChannels, void *pDataBuffer, uint32_t unBufferLen )  { return 0; }
 
+	void WatchdogWakeUp();
 private:
 	vr::IClientDriverHost *m_pClientDriverHost;
 
 	bool m_bEnableNullDriver;
 	bool m_bInit;
+	vr::EClientDriverMode m_eDriverMode;
+	std::thread *m_pWatchdogThread;
 };
 
 CClientDriver_Sample g_clientDriverNull;
 
 
-EVRInitError CClientDriver_Sample::Init( vr::IDriverLog *pDriverLog, vr::IClientDriverHost *pDriverHost, const char *pchUserDriverConfigDir, const char *pchDriverInstallDir ) 
+bool g_bExiting = false;
+
+void WatchdogThreadFunction(  )
+{
+	while ( !g_bExiting )
+	{
+#if defined( _WINDOWS )
+		// on windows send the event when the Y key is pressed.
+		if ( (0x01 & GetAsyncKeyState( 'Y' )) != 0 )
+		{
+			// Y key was pressed. 
+			g_clientDriverNull.WatchdogWakeUp();
+		}
+		std::this_thread::sleep_for( std::chrono::microseconds( 500 ) );
+#else
+		// for the other platforms, just send one every five seconds
+		std::this_thread::sleep_for( std::chrono::seconds( 5 ) );
+		g_clientDriverNull.WatchdogWakeUp();
+#endif
+	}
+}
+
+EVRInitError CClientDriver_Sample::Init( vr::EClientDriverMode eDriverMode, vr::IDriverLog *pDriverLog, vr::IClientDriverHost *pDriverHost, const char *pchUserDriverConfigDir, const char *pchDriverInstallDir )
 {
 	m_pClientDriverHost = pDriverHost;
 	InitDriverLog( pDriverLog );
 
+	m_eDriverMode = eDriverMode;
+
 	if ( !m_bInit )
 	{
-
 		if ( m_pClientDriverHost )
 		{
 			IVRSettings *pSettings = m_pClientDriverHost->GetSettings( vr::IVRSettings_Version );
@@ -109,12 +143,46 @@ EVRInitError CClientDriver_Sample::Init( vr::IDriverLog *pDriverLog, vr::IClient
 		m_bInit = true;
 	}
 
+	if ( eDriverMode == ClientDriverMode_Watchdog )
+	{
+		if ( !m_bEnableNullDriver )
+		{
+			return VRInitError_Init_LowPowerWatchdogNotSupported;
+		}
+
+		// Watchdog mode on Windows starts a thread that listens for the 'Y' key on the keyboard to 
+		// be pressed. A real driver should wait for a system button event or something else from the 
+		// the hardware that signals that the VR system should start up.
+		g_bExiting = false;
+		m_pWatchdogThread = new std::thread( WatchdogThreadFunction );
+		if ( !m_pWatchdogThread )
+		{
+			DriverLog( "Unable to create watchdog thread\n");
+			return VRInitError_Driver_Failed;
+		}
+	}
+
 	return VRInitError_None;
 }
 
 
+void CClientDriver_Sample::WatchdogWakeUp()
+{
+	if ( m_pClientDriverHost )
+		m_pClientDriverHost->WatchdogWakeUp();
+}
+
+
 void CClientDriver_Sample::Cleanup() 
 {
+	g_bExiting = true;
+	if ( m_pWatchdogThread )
+	{
+		m_pWatchdogThread->join();
+		delete m_pWatchdogThread;
+		m_pWatchdogThread = nullptr;
+	}
+
 	CleanupDriverLog();
 }