diff options
| author | Mathew Maidment <mathew1800@gmail.com> | 2015-12-22 19:26:26 -0500 |
|---|---|---|
| committer | Mathew Maidment <mathew1800@gmail.com> | 2015-12-22 19:26:26 -0500 |
| commit | 3cf16f85738bbcff0a5c4027f26adf30f548bb59 (patch) | |
| tree | 3b99a3253097ce1e6908a2ac06d4735e4d46e5bb /Source/Core/VideoBackends/D3D/Render.cpp | |
| parent | a55af16131e74bebb957648001ab9ac78e600325 (diff) | |
| parent | da0e647346bb241439c9f7271b4efa6b675501e8 (diff) | |
Merge pull request #3382 from lioncash/render
Render: Get rid of explicit new and delete
Diffstat (limited to 'Source/Core/VideoBackends/D3D/Render.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/Render.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp index 970a7e5bea..313720d79e 100644 --- a/Source/Core/VideoBackends/D3D/Render.cpp +++ b/Source/Core/VideoBackends/D3D/Render.cpp @@ -4,6 +4,7 @@ #include <cinttypes> #include <cmath> +#include <memory> #include <string> #include <strsafe.h> #include <unordered_map> @@ -86,7 +87,7 @@ static void SetupDeviceObjects() { s_television.Init(); - g_framebuffer_manager = new FramebufferManager; + g_framebuffer_manager = std::make_unique<FramebufferManager>(); HRESULT hr; float colmat[20]= {0.0f}; @@ -169,7 +170,7 @@ static void SetupDeviceObjects() // Kill off all device objects static void TeardownDeviceObjects() { - delete g_framebuffer_manager; + g_framebuffer_manager.reset(); SAFE_RELEASE(access_efb_cbuf); SAFE_RELEASE(clearblendstates[0]); @@ -999,8 +1000,7 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, co D3D::context->OMSetRenderTargets(1, &D3D::GetBackBuffer()->GetRTV(), nullptr); - delete g_framebuffer_manager; - g_framebuffer_manager = new FramebufferManager; + g_framebuffer_manager = std::make_unique<FramebufferManager>(); float clear_col[4] = { 0.f, 0.f, 0.f, 1.f }; D3D::context->ClearRenderTargetView(FramebufferManager::GetEFBColorTexture()->GetRTV(), clear_col); D3D::context->ClearDepthStencilView(FramebufferManager::GetEFBDepthTexture()->GetDSV(), D3D11_CLEAR_DEPTH, 0.f, 0); |