mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-14 06:09:02 +08:00
1d424272b9
Updates to latest tagged release. Now uses the provided cmake file instead of using a custom one (although a custom target file was added) - [*] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [*] SHA512s are updated for each updated download. - [*] The "supports" clause reflects platforms that may be fixed by this new version. - [*] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file. - [*] Any patches that are no longer applied are deleted from the port's directory. - [*] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [*] Only one version is added to each modified port's versions file.
21 lines
1.1 KiB
Diff
21 lines
1.1 KiB
Diff
diff --git a/src/D3D12MemAlloc.cpp b/src/D3D12MemAlloc.cpp
|
|
index 2555ef6..e2d444e 100644
|
|
--- a/src/D3D12MemAlloc.cpp
|
|
+++ b/src/D3D12MemAlloc.cpp
|
|
@@ -7181,11 +7181,11 @@ void AllocatorPimpl::BuildStatsString(WCHAR** ppStatsString, BOOL detailedMap)
|
|
json.WriteString(m_AdapterDesc.Description);
|
|
|
|
json.WriteString(L"DedicatedVideoMemory");
|
|
- json.WriteNumber(m_AdapterDesc.DedicatedVideoMemory);
|
|
+ json.WriteNumber((UINT64)m_AdapterDesc.DedicatedVideoMemory);
|
|
json.WriteString(L"DedicatedSystemMemory");
|
|
- json.WriteNumber(m_AdapterDesc.DedicatedSystemMemory);
|
|
+ json.WriteNumber((UINT64)m_AdapterDesc.DedicatedSystemMemory);
|
|
json.WriteString(L"SharedSystemMemory");
|
|
- json.WriteNumber(m_AdapterDesc.SharedSystemMemory);
|
|
+ json.WriteNumber((UINT64)m_AdapterDesc.SharedSystemMemory);
|
|
|
|
json.WriteString(L"ResourceHeapTier");
|
|
json.WriteNumber(static_cast<UINT>(m_D3D12Options.ResourceHeapTier));
|
|
|