SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert m_pOffscreenSurface from pointer to object

Browse Source
This commit is contained in:
Vasily
2019-11-30 18:14:49 +01:00
committed by username223
parent 8136569455
commit 96e80ec3ce
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlaycontroller.cpp
+3 -5
View File
@@ -118,10 +118,9 @@ OverlayController::OverlayController( bool desktopMode,
} }
// create an offscreen surface to attach the context and FBO to // create an offscreen surface to attach the context and FBO to
m_pOffscreenSurface.reset( new QOffscreenSurface() ); m_offscreenSurface.setFormat( m_openGLContext.format() );
m_pOffscreenSurface->setFormat( m_openGLContext.format() ); m_offscreenSurface.create();
m_pOffscreenSurface->create(); m_openGLContext.makeCurrent( &m_offscreenSurface );
m_openGLContext.makeCurrent( m_pOffscreenSurface.get() );
if ( !vr::VROverlay() ) if ( !vr::VROverlay() )
{ {
@@ -417,7 +416,6 @@ void OverlayController::Shutdown()
m_pRenderTimer.reset(); m_pRenderTimer.reset();
} }
m_pFbo.reset(); m_pFbo.reset();
m_pOffscreenSurface.reset();
// save to settings that shutdown was safe // save to settings that shutdown was safe
setPreviousShutdownSafe( true ); setPreviousShutdownSafe( true );
src/overlaycontroller.h
+1 -1
View File
@@ -110,7 +110,7 @@ private:
QQuickWindow m_window{ &m_renderControl }; QQuickWindow m_window{ &m_renderControl };
std::unique_ptr<QOpenGLFramebufferObject> m_pFbo; std::unique_ptr<QOpenGLFramebufferObject> m_pFbo;
QOpenGLContext m_openGLContext; QOpenGLContext m_openGLContext;
std::unique_ptr<QOffscreenSurface> m_pOffscreenSurface; QOffscreenSurface m_offscreenSurface;
std::unique_ptr<QTimer> m_pPumpEventsTimer; std::unique_ptr<QTimer> m_pPumpEventsTimer;
std::unique_ptr<QTimer> m_pRenderTimer; std::unique_ptr<QTimer> m_pRenderTimer;