From df667b7b0eee4ede3f59951d1ff83acfa9dab79c Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Mon, 3 Dec 2018 21:31:44 +0100 Subject: [PATCH] [dxgi] Report Adapter LUID if available --- src/dxgi/dxgi_adapter.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/dxgi/dxgi_adapter.cpp b/src/dxgi/dxgi_adapter.cpp index 6ccc7395..1f3b2bd7 100644 --- a/src/dxgi/dxgi_adapter.cpp +++ b/src/dxgi/dxgi_adapter.cpp @@ -149,6 +149,7 @@ namespace dxvk { auto deviceProp = m_adapter->deviceProperties(); auto memoryProp = m_adapter->memoryProperties(); + auto deviceId = m_adapter->devicePropertiesExt().coreDeviceId; // Custom Vendor / Device ID if (options->customVendorId >= 0) @@ -208,10 +209,13 @@ namespace dxvk { pDesc->DedicatedVideoMemory = deviceMemory; pDesc->DedicatedSystemMemory = 0; pDesc->SharedSystemMemory = sharedMemory; - pDesc->AdapterLuid = LUID { 0, 0 }; // TODO implement + pDesc->AdapterLuid = LUID { 0, 0 }; pDesc->Flags = 0; pDesc->GraphicsPreemptionGranularity = DXGI_GRAPHICS_PREEMPTION_DMA_BUFFER_BOUNDARY; pDesc->ComputePreemptionGranularity = DXGI_COMPUTE_PREEMPTION_DMA_BUFFER_BOUNDARY; + + if (deviceId.deviceLUIDValid) + std::memcpy(&pDesc->AdapterLuid, deviceId.deviceLUID, VK_LUID_SIZE); return S_OK; }