mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #918 from mendsley/fix_glvr

Browse Source 
Fix opengl OVR texture lifetime issues
This commit is contained in:
Branimir Karadžić 2016-09-16 16:10:33 -07:00 committed by GitHub
commit 76902c7342
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/hmd_ovr.h
View File

@ -30,6 +30,7 @@ namespace bgfx
// render data for both eyes and mirrored output
struct BX_NO_VTABLE OVRRenderI
{
OVRRenderI();
virtual ~OVRRenderI() = 0;
virtual void create(const ovrSession& _session, int _msaaSamples, int _mirrorWidth, int _mirrorHeight) = 0;
virtual void destroy(const ovrSession& _session) = 0;
@ -44,6 +45,12 @@ namespace bgfx
ovrMirrorTextureDesc m_mirrorTextureDesc;
};
inline OVRRenderI::OVRRenderI()
: m_mirrorTexture(NULL)
{
memset(&m_textureSwapChain, 0, sizeof(m_textureSwapChain));
}
inline OVRRenderI::~OVRRenderI()
{
}

6
src/renderer_d3d11.cpp
View File

@ -3610,12 +3610,6 @@ BX_PRAGMA_DIAGNOSTIC_POP();
}
#if BGFX_CONFIG_USE_OVR
OVRRenderD3D11::OVRRenderD3D11()
{
m_mirrorTexture = NULL;
memset(m_textureSwapChain, 0, sizeof(m_textureSwapChain));
}
void OVRRenderD3D11::create(const ovrSession& _session, int _msaaSamples, int _mirrorWidth, int _mirrorHeight)
{
ovrHmdDesc hmdDesc = ovr_GetHmdDesc(_session);

1
src/renderer_d3d11.h
View File

@ -63,7 +63,6 @@ namespace bgfx { namespace d3d11
#if BGFX_CONFIG_USE_OVR
struct OVRRenderD3D11 : public OVRRenderI
{
OVRRenderD3D11();
virtual void create(const ovrSession& _session, int _msaaSamples, int _mirrorWidth, int _mirrorHeight);
virtual void destroy(const ovrSession& _session);
virtual void preReset(const ovrSession& _session);

2
src/renderer_gl.cpp
View File

@ -3545,7 +3545,7 @@ namespace bgfx { namespace gl
ovr_GetTextureSwapChainCurrentIndex(_session, m_textureSwapChain[_eyeIdx], &curIndex);
ovr_GetTextureSwapChainBufferGL(_session, m_textureSwapChain[_eyeIdx], curIndex, &m_eyeTexId[_eyeIdx]);
if (0 != m_msaaEyeFbo)
if (0 != m_msaaEyeFbo[_eyeIdx])
{
GL_CHECK(glBindFramebuffer(GL_FRAMEBUFFER, m_msaaEyeFbo[_eyeIdx]) );
GL_CHECK(glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D_MULTISAMPLE, m_msaaEyeTexId[_eyeIdx], 0) );