From 0c885fec2e684bf4d6729ba02918e4cb0bbe790b Mon Sep 17 00:00:00 2001 From: Andrew Willmott Date: Wed, 9 May 2018 15:25:29 +0100 Subject: [PATCH] fix ovr compile errors (#1387) --- src/renderer_d3d11.cpp | 8 ++++---- src/renderer_gl.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/renderer_d3d11.cpp b/src/renderer_d3d11.cpp index c18e249c5..df00a2e58 100644 --- a/src/renderer_d3d11.cpp +++ b/src/renderer_d3d11.cpp @@ -3089,10 +3089,10 @@ namespace bgfx { namespace d3d11 void ovrPostReset() { #if BGFX_CONFIG_USE_OVR - if (m_resolution.m_flags & (BGFX_RESET_HMD|BGFX_RESET_HMD_DEBUG) ) + if (m_resolution.reset & (BGFX_RESET_HMD|BGFX_RESET_HMD_DEBUG) ) { - const uint32_t msaaSamples = 1 << ((m_resolution.m_flags&BGFX_RESET_MSAA_MASK) >> BGFX_RESET_MSAA_SHIFT); - m_ovr.postReset(msaaSamples, m_resolution.m_width, m_resolution.m_height); + const uint32_t msaaSamples = 1 << ((m_resolution.reset&BGFX_RESET_MSAA_MASK) >> BGFX_RESET_MSAA_SHIFT); + m_ovr.postReset(msaaSamples, m_resolution.width, m_resolution.height); } #endif // BGFX_CONFIG_USE_OVR } @@ -3756,8 +3756,8 @@ namespace bgfx { namespace d3d11 ovrResult result = ovr_CommitTextureSwapChain(m_session, m_textureSwapChain); if (!OVR_SUCCESS(result) ) { - return false; DX_RELEASE(eyeTexture, 1); + return false; } ovrLayerHeader* layerList = &m_renderLayer.Header; diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp index f27250d8b..83c7a3ba7 100644 --- a/src/renderer_gl.cpp +++ b/src/renderer_gl.cpp @@ -3492,10 +3492,10 @@ BX_TRACE("%d, %d, %d, %s", _array, _srgb, _mipAutogen, getName(_format) ); void ovrPostReset() { #if BGFX_CONFIG_USE_OVR - if (m_resolution.m_flags & (BGFX_RESET_HMD|BGFX_RESET_HMD_DEBUG) ) + if (m_resolution.reset & (BGFX_RESET_HMD|BGFX_RESET_HMD_DEBUG) ) { - const uint32_t msaaSamples = 1 << ( (m_resolution.m_flags&BGFX_RESET_MSAA_MASK) >> BGFX_RESET_MSAA_SHIFT); - m_ovr.postReset(msaaSamples, m_resolution.m_width, m_resolution.m_height); + const uint32_t msaaSamples = 1 << ( (m_resolution.reset&BGFX_RESET_MSAA_MASK) >> BGFX_RESET_MSAA_SHIFT); + m_ovr.postReset(msaaSamples, m_resolution.width, m_resolution.height); } #endif // BGFX_CONFIG_USE_OVR } @@ -4006,7 +4006,7 @@ BX_TRACE("%d, %d, %d, %s", _array, _srgb, _mipAutogen, getName(_format) ); if (NULL == m_textureSwapChain) { const GLsizei width = _desc.m_eyeSize[0].m_w + _desc.m_eyeSize[1].m_w; - const GLsizei height = bx::uint16_max(_desc.m_eyeSize[0].m_h, _desc.m_eyeSize[1].m_h); + const GLsizei height = bx::uint32_max(_desc.m_eyeSize[0].m_h, _desc.m_eyeSize[1].m_h); ovrTextureSwapChainDesc swapchainDesc = {}; swapchainDesc.Type = ovrTexture_2D;