summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/FramebufferManagerBase.cpp
diff options
context:
space:
mode:
authordegasus <wickmarkus@web.de>2015-11-21 10:45:26 +0100
committerdegasus <wickmarkus@web.de>2015-11-24 22:48:55 +0100
commit0f26cdd31bba90041f74a5a65973f52dcdf5db63 (patch)
treed4009cd36192ea97782c1ca62317ac36c74c9ca8 /Source/Core/VideoCommon/FramebufferManagerBase.cpp
parentc9dc5fb3762dd98462061538cfa9789216b47477 (diff)
FramebufferManager: Allow CreateXFBSource to return nullptr
Diffstat (limited to 'Source/Core/VideoCommon/FramebufferManagerBase.cpp')
-rw-r--r--Source/Core/VideoCommon/FramebufferManagerBase.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/Core/VideoCommon/FramebufferManagerBase.cpp b/Source/Core/VideoCommon/FramebufferManagerBase.cpp
index 7981dfce4d..48106844cd 100644
--- a/Source/Core/VideoCommon/FramebufferManagerBase.cpp
+++ b/Source/Core/VideoCommon/FramebufferManagerBase.cpp
@@ -62,6 +62,9 @@ const XFBSourceBase* const* FramebufferManagerBase::GetRealXFBSource(u32 xfbAddr
if (!m_realXFBSource)
m_realXFBSource = g_framebuffer_manager->CreateXFBSource(fbWidth, fbHeight, 1);
+ if (!m_realXFBSource)
+ return nullptr;
+
m_realXFBSource->srcAddr = xfbAddr;
m_realXFBSource->srcWidth = MAX_XFB_WIDTH;
@@ -160,6 +163,9 @@ void FramebufferManagerBase::CopyToVirtualXFB(u32 xfbAddr, u32 fbStride, u32 fbH
if (!vxfb->xfbSource)
{
vxfb->xfbSource = g_framebuffer_manager->CreateXFBSource(target_width, target_height, m_EFBLayers);
+ if (!vxfb->xfbSource)
+ return;
+
vxfb->xfbSource->texWidth = target_width;
vxfb->xfbSource->texHeight = target_height;
}