encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

d3d: fix driver description 

Bug: dawn:1705
Change-Id: I3077bcc8e136359afc7da036dea5284aef59c3c4
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/132281
Commit-Queue: Peng Huang <penghuang@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Austin Eng <enga@chromium.org>
This commit is contained in:
Peng Huang 2023-05-09 23:15:17 +00:00 committed by Dawn LUCI CQ
parent 49db496a51
commit 2c9f88ef1d
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/dawn/native/d3d/PhysicalDeviceD3D.cpp
View File

@ -55,7 +55,7 @@ MaybeError PhysicalDevice::InitializeImpl() {
mAdapterType = wgpu::AdapterType::DiscreteGPU; mAdapterType = wgpu::AdapterType::DiscreteGPU;
} }
// Convert the adapter's D3D11 driver version to a readable string like "24.21.13.9793". // Convert the adapter's D3D driver version to a readable string like "24.21.13.9793".
LARGE_INTEGER umdVersion; LARGE_INTEGER umdVersion;
if (GetHardwareAdapter()->CheckInterfaceSupport(__uuidof(IDXGIDevice), &umdVersion) != if (GetHardwareAdapter()->CheckInterfaceSupport(__uuidof(IDXGIDevice), &umdVersion) !=
DXGI_ERROR_UNSUPPORTED) { DXGI_ERROR_UNSUPPORTED) {
@ -65,7 +65,18 @@ MaybeError PhysicalDevice::InitializeImpl() {
static_cast<uint16_t>((encodedVersion >> 32) & mask), static_cast<uint16_t>((encodedVersion >> 32) & mask),
static_cast<uint16_t>((encodedVersion >> 16) & mask), static_cast<uint16_t>((encodedVersion >> 16) & mask),
static_cast<uint16_t>(encodedVersion & mask)}; static_cast<uint16_t>(encodedVersion & mask)};
mDriverDescription = std::string("D3D11 driver version ") + mDriverVersion.ToString(); switch (GetBackendType()) {
case wgpu::BackendType::D3D11:
mDriverDescription =
std::string("D3D11 driver version ") + mDriverVersion.ToString();
break;
case wgpu::BackendType::D3D12:
mDriverDescription =
std::string("D3D12 driver version ") + mDriverVersion.ToString();
break;
default:
UNREACHABLE();
}
} }
return {}; return {};