From 16d36c739d0b0020e470e98a3606594e20bb5200 Mon Sep 17 00:00:00 2001 From: Jens Peters Date: Tue, 19 Oct 2021 23:35:38 +0200 Subject: [PATCH] nvapi: Use correct error code --- src/nvapi.cpp | 2 +- src/util/util_statuscode.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/nvapi.cpp b/src/nvapi.cpp index 6d8104e6..82387fb8 100644 --- a/src/nvapi.cpp +++ b/src/nvapi.cpp @@ -80,7 +80,7 @@ extern "C" { auto adapter = reinterpret_cast(hLogicalGPU); if (!nvapiAdapterRegistry->IsAdapter(adapter)) - return ExpectedPhysicalGpuHandle(n); + return ExpectedLogicalGpuHandle(n); hPhysicalGPU[0] = reinterpret_cast(adapter); *pGpuCount = 1; diff --git a/src/util/util_statuscode.h b/src/util/util_statuscode.h index 46882a86..5a0b6bcf 100644 --- a/src/util/util_statuscode.h +++ b/src/util/util_statuscode.h @@ -75,6 +75,11 @@ namespace dxvk { return NVAPI_EXPECTED_PHYSICAL_GPU_HANDLE; } + inline NvAPI_Status ExpectedLogicalGpuHandle(const std::string& logMessage) { + log::write(str::format(logMessage, ": Expected logical GPU handle")); + return NVAPI_EXPECTED_LOGICAL_GPU_HANDLE; + } + inline NvAPI_Status IncompatibleStructVersion(const std::string& logMessage) { log::write(str::format(logMessage, ": Incompatible struct version")); return NVAPI_INCOMPATIBLE_STRUCT_VERSION;