diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2015-12-21 22:48:13 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2015-12-21 22:48:13 +0100 |
| commit | 4c428ed01946ab3137b910d99494ba0ca77665c7 (patch) | |
| tree | f0da725626020383be61a57ab3a8f6ed41ef2142 /Source/Core/VideoBackends/D3D/FramebufferManager.cpp | |
| parent | 9039cc58606612ca9f14631d148b72cf6b13133f (diff) | |
| parent | f448c6e291cc4207e3978ff5510c66f0d4d8dd29 (diff) | |
Merge pull request #3372 from lioncash/framebuffer
FramebufferManagerBase: Get rid of explicit delete and new
Diffstat (limited to 'Source/Core/VideoBackends/D3D/FramebufferManager.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/FramebufferManager.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/Core/VideoBackends/D3D/FramebufferManager.cpp b/Source/Core/VideoBackends/D3D/FramebufferManager.cpp index c4881ec0f2..968337a1b0 100644 --- a/Source/Core/VideoBackends/D3D/FramebufferManager.cpp +++ b/Source/Core/VideoBackends/D3D/FramebufferManager.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include <memory> + #include "Core/HW/Memmap.h" #include "VideoBackends/D3D/D3DBase.h" #include "VideoBackends/D3D/D3DUtil.h" @@ -13,7 +15,8 @@ #include "VideoBackends/D3D/XFBEncoder.h" #include "VideoCommon/VideoConfig.h" -namespace DX11 { +namespace DX11 +{ static XFBEncoder s_xfbEncoder; @@ -176,9 +179,9 @@ void FramebufferManager::CopyToRealXFB(u32 xfbAddr, u32 fbStride, u32 fbHeight, s_xfbEncoder.Encode(dst, fbStride/2, fbHeight, sourceRc, Gamma); } -XFBSourceBase* FramebufferManager::CreateXFBSource(unsigned int target_width, unsigned int target_height, unsigned int layers) +std::unique_ptr<XFBSourceBase> FramebufferManager::CreateXFBSource(unsigned int target_width, unsigned int target_height, unsigned int layers) { - return new XFBSource(D3DTexture2D::Create(target_width, target_height, + return std::make_unique<XFBSource>(D3DTexture2D::Create(target_width, target_height, (D3D11_BIND_FLAG)(D3D11_BIND_RENDER_TARGET|D3D11_BIND_SHADER_RESOURCE), D3D11_USAGE_DEFAULT, DXGI_FORMAT_R8G8B8A8_UNORM, 1, layers), layers); } |
