lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-05 01:20:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle a NULL device passed into IDXGIOutput::FindClosestMatchingMode

Browse Source
This commit is contained in:
baldurk
2022-01-13 14:14:07 +00:00
parent 8435a1ab72
commit cc9fab3659
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/dxgi/dxgi_wrapped.cpp
+22 -14
View File
@@ -619,16 +619,20 @@ WrappedIDXGIOutput6::~WrappedIDXGIOutput6()
HRESULT STDMETHODCALLTYPE WrappedIDXGIOutput6::FindClosestMatchingMode(
const DXGI_MODE_DESC *pModeToMatch, DXGI_MODE_DESC *pClosestMatch, IUnknown *pConcernedDevice)
{
ID3DDevice *wrapDevice = GetD3DDevice(pConcernedDevice);
if(wrapDevice)
return m_pReal->FindClosestMatchingMode(pModeToMatch, pClosestMatch,
wrapDevice->GetRealIUnknown());
if(pConcernedDevice)
{
ID3DDevice *wrapDevice = GetD3DDevice(pConcernedDevice);
if(wrapDevice)
return m_pReal->FindClosestMatchingMode(pModeToMatch, pClosestMatch,
wrapDevice->GetRealIUnknown());
RDCERR("Unrecognised device in FindClosestMatchingMode()");
return E_INVALIDARG;
return E_INVALIDARG;
}
return m_pReal->FindClosestMatchingMode(pModeToMatch, pClosestMatch, NULL);
}
HRESULT STDMETHODCALLTYPE WrappedIDXGIOutput6::TakeOwnership(IUnknown *pDevice, BOOL Exclusive)
@@ -646,16 +650,20 @@ HRESULT STDMETHODCALLTYPE WrappedIDXGIOutput6::TakeOwnership(IUnknown *pDevice,
HRESULT STDMETHODCALLTYPE WrappedIDXGIOutput6::FindClosestMatchingMode1(
const DXGI_MODE_DESC1 *pModeToMatch, DXGI_MODE_DESC1 *pClosestMatch, IUnknown *pConcernedDevice)
{
ID3DDevice *wrapDevice = GetD3DDevice(pConcernedDevice);
if(wrapDevice)
return m_pReal1->FindClosestMatchingMode1(pModeToMatch, pClosestMatch,
wrapDevice->GetRealIUnknown());
if(pConcernedDevice)
{
ID3DDevice *wrapDevice = GetD3DDevice(pConcernedDevice);
if(wrapDevice)
return m_pReal1->FindClosestMatchingMode1(pModeToMatch, pClosestMatch,
wrapDevice->GetRealIUnknown());
RDCERR("Unrecognised device in FindClosestMatchingMode1()");
return E_INVALIDARG;
return E_INVALIDARG;
}
return m_pReal1->FindClosestMatchingMode1(pModeToMatch, pClosestMatch, NULL);
}
HRESULT STDMETHODCALLTYPE WrappedIDXGIOutput6::GetDisplaySurfaceData1(IDXGIResource *pDestination)