Skip to content

Fix clang errors in 9on12Adapter.cpp #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jenatali merged 1 commit into from
Jun 13, 2026
Merged

Fix clang errors in 9on12Adapter.cpp #113

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/9on12Adapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ namespace D3D9on12

if (pAdapter)
{
CComQIPtr<IDXCoreAdapter> pDXCoreAdapter = pAdapter;
CComQIPtr<IDXCoreAdapter> pDXCoreAdapter = pAdapter.p;
ThrowFailure(pDXCoreAdapter->GetProperty(DXCoreAdapterProperty::HardwareID, &m_HWIDs));
ThrowFailure(pDXCoreAdapter->GetProperty(DXCoreAdapterProperty::DriverVersion, &m_DriverVersion));
}
Expand All @@ -242,7 +242,7 @@ namespace D3D9on12
ThrowFailure(CreateDXGIFactory2(0, IID_PPV_ARGS(&pFactory)));
ThrowFailure(pFactory->EnumAdapterByLuid(*pAdapterLUID, IID_PPV_ARGS(&pAdapter)));

CComQIPtr<IDXGIAdapter> pDXGIAdapter = pAdapter;
CComQIPtr<IDXGIAdapter> pDXGIAdapter = pAdapter.p;
DXGI_ADAPTER_DESC AdapterDesc;
ThrowFailure(pDXGIAdapter->GetDesc(&AdapterDesc));
m_HWIDs = { AdapterDesc.VendorId, AdapterDesc.DeviceId, AdapterDesc.SubSysId, AdapterDesc.Revision };
Expand All @@ -258,7 +258,8 @@ namespace D3D9on12
ThrowFailure(pArgs->pD3D12Device->QueryInterface(&m_pD3D12Device));

// Ensure the app provided D3D12 runtime matches up with the adapter the 9on12 device is being created ondapterLuid));
ThrowFailure((memcmp(&m_pD3D12Device->GetAdapterLuid(), pAdapterLUID, sizeof(*pAdapterLUID)) == 0) ?
LUID deviceAdapterLuid = m_pD3D12Device->GetAdapterLuid();
ThrowFailure((memcmp(&deviceAdapterLuid, pAdapterLUID, sizeof(*pAdapterLUID)) == 0) ?
S_OK : E_FAIL);
}
else
Expand Down
Loading