ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

D3D12/Context: Don't assert-fail when D3D12 is unavailable

This commit is contained in:
Connor McLaughlin 2022-12-16 19:59:41 +10:00 committed by refractionpcsx2
parent eba2273cd1
commit 6a548440ea
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/D3D12/Context.cpp
View File

@ -209,7 +209,6 @@ bool Context::CreateDevice(IDXGIFactory* dxgi_factory, u32 adapter_index, bool e
// Create the actual device. // Create the actual device.
hr = s_d3d12_create_device(adapter.get(), D3D_FEATURE_LEVEL_11_0, IID_PPV_ARGS(&m_device)); hr = s_d3d12_create_device(adapter.get(), D3D_FEATURE_LEVEL_11_0, IID_PPV_ARGS(&m_device));
pxAssertRel(SUCCEEDED(hr), "Create D3D12 device");
if (FAILED(hr)) if (FAILED(hr))
return false; return false;
@ -548,7 +547,11 @@ void Context::DestroyPendingResources(CommandListResources& cmdlist)
void Context::DestroyResources() void Context::DestroyResources()
{ {
ExecuteCommandList(WaitType::Sleep); if (m_command_queue)
{
ExecuteCommandList(WaitType::Sleep);
WaitForGPUIdle();
}
m_texture_stream_buffer.Destroy(false); m_texture_stream_buffer.Destroy(false);
m_descriptor_heap_manager.Free(&m_null_srv_descriptor); m_descriptor_heap_manager.Free(&m_null_srv_descriptor);