zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-29 23:33:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- use a unique_ptr for the GL debug object.

Browse source 
This doesn’t get shared and the containing class doesn’t need to be copied so this is sufficient.
This commit is contained in:
Christoph Oelckers 2022-06-07 00:11:56 +02:00
parent 989dcfcf1c
commit c7798d5503
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/rendering/gl/gl_framebuffer.cpp
View file

@ -175,7 +175,7 @@ void OpenGLFrameBuffer::InitializeState()
GLRenderer->Initialize(GetWidth(), GetHeight()); GLRenderer->Initialize(GetWidth(), GetHeight());
static_cast<GLDataBuffer*>(mLights->GetBuffer())->BindBase(); static_cast<GLDataBuffer*>(mLights->GetBuffer())->BindBase();
mDebug = std::make_shared<FGLDebug>(); mDebug = std::make_unique<FGLDebug>();
mDebug->Update(); mDebug->Update();
} }

3
src/common/rendering/gl/gl_framebuffer.h
View file

@ -20,7 +20,6 @@ class OpenGLFrameBuffer : public SystemGLFrameBuffer
public: public:
explicit OpenGLFrameBuffer() {}
OpenGLFrameBuffer(void *hMonitor, bool fullscreen) ; OpenGLFrameBuffer(void *hMonitor, bool fullscreen) ;
~OpenGLFrameBuffer(); ~OpenGLFrameBuffer();
bool CompileNextShader() override; bool CompileNextShader() override;
@ -66,7 +65,7 @@ public:
void PostProcessScene(bool swscene, int fixedcm, float flash, const std::function<void()> &afterBloomDrawEndScene2D) override; void PostProcessScene(bool swscene, int fixedcm, float flash, const std::function<void()> &afterBloomDrawEndScene2D) override;
bool HWGammaActive = false; // Are we using hardware or software gamma? 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 *WipeStartScreen() override;
FTexture *WipeEndScreen() override; FTexture *WipeEndScreen() override;

2
src/common/rendering/gles/gles_framebuffer.h
View file

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