ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

D3D12Device: Fix pipeline cache load error after device change

This commit is contained in:
Stenzek 2024-05-12 15:23:58 +10:00
parent c85e743573
commit 7bb8cbcbaa
No known key found for this signature in database
1 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/util/d3d12_device.cpp
View File

@ -287,21 +287,42 @@ void D3D12Device::DestroyDevice()
bool D3D12Device::ReadPipelineCache(const std::string& filename) bool D3D12Device::ReadPipelineCache(const std::string& filename)
{ {
std::optional<std::vector<u8>> data; std::optional<std::vector<u8>> data = FileSystem::ReadBinaryFile(filename.c_str());
auto fp = FileSystem::OpenManagedCFile(filename.c_str(), "rb"); HRESULT hr =
if (fp)
data = FileSystem::ReadBinaryFile(fp.get());
const HRESULT hr =
m_device->CreatePipelineLibrary(data.has_value() ? data->data() : nullptr, data.has_value() ? data->size() : 0, m_device->CreatePipelineLibrary(data.has_value() ? data->data() : nullptr, data.has_value() ? data->size() : 0,
IID_PPV_ARGS(m_pipeline_library.ReleaseAndGetAddressOf())); IID_PPV_ARGS(m_pipeline_library.ReleaseAndGetAddressOf()));
if (FAILED(hr)) if (SUCCEEDED(hr))
Log_WarningPrintf("CreatePipelineLibrary() failed with HRESULT %08X, pipeline caching will not be available.", hr); {
else if (data.has_value()) if (data.has_value())
s_pipeline_cache_data = std::move(data.value()); s_pipeline_cache_data = std::move(data.value());
return SUCCEEDED(hr); return true;
}
// Try without the cache data.
if (data.has_value())
{
Log_WarningFmt("CreatePipelineLibrary() failed, trying without cache data. Error: {}",
Error::CreateHResult(hr).GetDescription());
hr = m_device->CreatePipelineLibrary(nullptr, 0, IID_PPV_ARGS(m_pipeline_library.ReleaseAndGetAddressOf()));
if (SUCCEEDED(hr))
{
// Delete cache file, it's no longer relevant.
Log_InfoFmt("Deleting pipeline cache file {}", filename);
FileSystem::DeleteFile(filename.c_str());
}
}
if (FAILED(hr))
{
Log_WarningFmt("CreatePipelineLibrary() failed, pipeline caching will not be available. Error: {}",
Error::CreateHResult(hr).GetDescription());
return false;
}
return true;
} }
bool D3D12Device::GetPipelineCacheData(DynamicHeapArray<u8>* data) bool D3D12Device::GetPipelineCacheData(DynamicHeapArray<u8>* data)