From a352ecb7e63304034ac93332cf0c4d9183df867e Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 14 Jul 2015 07:12:13 +0200 Subject: Fix compilation / linkage of 0.5.0.1 HEADLESS_APP mode Tested: GNU/Linux and OSX --- LibOVR/Src/CAPI/CAPI_HMDState.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'LibOVR/Src/CAPI') diff --git a/LibOVR/Src/CAPI/CAPI_HMDState.cpp b/LibOVR/Src/CAPI/CAPI_HMDState.cpp index 7a00bf8..fede019 100755 --- a/LibOVR/Src/CAPI/CAPI_HMDState.cpp +++ b/LibOVR/Src/CAPI/CAPI_HMDState.cpp @@ -146,6 +146,7 @@ HMDState::HMDState(HMDInfo const & hmdInfo, { pHSWDisplay = *OVR::CAPI::HSWDisplay::Factory(ovrRenderAPI_None, pHmdDesc, RenderState); } +#endif /* !defined(HEADLESS_APP) */ RenderIMUTimeSeconds = 0.; @@ -173,7 +174,6 @@ HMDState::~HMDState() OVR_FREE(pHmdDesc); pHmdDesc = nullptr; } -#endif /* !defined(HEADLESS_APP) */ } bool HMDState::InitializeSharedState() @@ -950,13 +950,18 @@ bool HMDState::ConfigureRendering(ovrEyeRenderDesc eyeRenderDescOut[2], if (!pRenderer) { +#if !defined(HEADLESS_APP) pRenderer = *DistortionRenderer::APICreateRegistry [apiConfig->Header.API](); +#endif /* !defined(HEADLESS_APP) */ } - if (!pRenderer || - !pRenderer->Initialize(apiConfig, &TheTrackingStateReader, - &TimewarpTimer, &RenderState)) + if (!pRenderer +#if !defined(HEADLESS_APP) + || !pRenderer->Initialize(apiConfig, &TheTrackingStateReader, + &TimewarpTimer, &RenderState) +#endif /* !defined(HEADLESS_APP) */ + ) { RenderingConfigured = false; return false; -- cgit v1.2.3