- use a unique_ptr for the GL debug object.

This doesn’t get shared and the containing class doesn’t need to be copied so this is sufficient.
ZDoom · Jun 6, 2022 · c7798d5 · c7798d5
1 parent 989dcfc
commit c7798d5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/src/common/rendering/gl/gl_framebuffer.cpp b/src/common/rendering/gl/gl_framebuffer.cpp
@@ -175,7 +175,7 @@ void OpenGLFrameBuffer::InitializeState()
 	GLRenderer->Initialize(GetWidth(), GetHeight());
 	static_cast<GLDataBuffer*>(mLights->GetBuffer())->BindBase();
 
-	mDebug = std::make_shared<FGLDebug>();
+	mDebug = std::make_unique<FGLDebug>();
 	mDebug->Update();
 }
 

diff --git a/src/common/rendering/gl/gl_framebuffer.h b/src/common/rendering/gl/gl_framebuffer.h
@@ -20,7 +20,6 @@ class OpenGLFrameBuffer : public SystemGLFrameBuffer
 
 public:
 
-	explicit OpenGLFrameBuffer() {}
 	OpenGLFrameBuffer(void *hMonitor, bool fullscreen) ;
 	~OpenGLFrameBuffer();
 	bool CompileNextShader() override;
@@ -66,7 +65,7 @@ class OpenGLFrameBuffer : public SystemGLFrameBuffer
 	void PostProcessScene(bool swscene, int fixedcm, float flash, const std::function<void()> &afterBloomDrawEndScene2D) override;
 
 	bool HWGammaActive = false;			// Are we using hardware or software gamma?
-	std::shared_ptr<FGLDebug> mDebug;	// Debug API
+	std::unique_ptr<FGLDebug> mDebug;	// Debug API
 
     FTexture *WipeStartScreen() override;
     FTexture *WipeEndScreen() override;

diff --git a/src/common/rendering/gles/gles_framebuffer.h b/src/common/rendering/gles/gles_framebuffer.h
@@ -10,7 +10,6 @@ namespace OpenGLESRenderer
 {
 
 class FHardwareTexture;
-class FGLDebug;
 
 class OpenGLFrameBuffer : public SystemGLFrameBuffer
 {
@@ -61,7 +60,6 @@ class OpenGLFrameBuffer : public SystemGLFrameBuffer
 	void PostProcessScene(bool swscene, int fixedcm, float flash, const std::function<void()> &afterBloomDrawEndScene2D) override;
 
 	bool HWGammaActive = false;			// Are we using hardware or software gamma?
-	std::shared_ptr<FGLDebug> mDebug;	// Debug API
 
     FTexture *WipeStartScreen() override;
     FTexture *WipeEndScreen() override;