From 96e80ec3cea11b91a8c10e3dcfcb47ae1ad328c8 Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Mon, 25 Nov 2019 13:38:36 +0100
Subject: [PATCH] Convert m_pOffscreenSurface from pointer to object

---
 src/overlaycontroller.cpp | 8 +++-----
 src/overlaycontroller.h   | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/overlaycontroller.cpp b/src/overlaycontroller.cpp
index 4e8d5d5..1d88476 100644
--- a/src/overlaycontroller.cpp
+++ b/src/overlaycontroller.cpp
@@ -118,10 +118,9 @@ OverlayController::OverlayController( bool desktopMode,
     }
 
     // create an offscreen surface to attach the context and FBO to
-    m_pOffscreenSurface.reset( new QOffscreenSurface() );
-    m_pOffscreenSurface->setFormat( m_openGLContext.format() );
-    m_pOffscreenSurface->create();
-    m_openGLContext.makeCurrent( m_pOffscreenSurface.get() );
+    m_offscreenSurface.setFormat( m_openGLContext.format() );
+    m_offscreenSurface.create();
+    m_openGLContext.makeCurrent( &m_offscreenSurface );
 
     if ( !vr::VROverlay() )
     {
@@ -417,7 +416,6 @@ void OverlayController::Shutdown()
         m_pRenderTimer.reset();
     }
     m_pFbo.reset();
-    m_pOffscreenSurface.reset();
 
     // save to settings that shutdown was safe
     setPreviousShutdownSafe( true );
diff --git a/src/overlaycontroller.h b/src/overlaycontroller.h
index 1782734..83a980a 100644
--- a/src/overlaycontroller.h
+++ b/src/overlaycontroller.h
@@ -110,7 +110,7 @@ private:
     QQuickWindow m_window{ &m_renderControl };
     std::unique_ptr<QOpenGLFramebufferObject> m_pFbo;
     QOpenGLContext m_openGLContext;
-    std::unique_ptr<QOffscreenSurface> m_pOffscreenSurface;
+    QOffscreenSurface m_offscreenSurface;
 
     std::unique_ptr<QTimer> m_pPumpEventsTimer;
     std::unique_ptr<QTimer> m_pRenderTimer;