nvapi: Format arguments in log statements

4 files changed, 10 insertions, 10 deletions

diff --git a/src/nvapi.cpp b/src/nvapi.cpp
index e276966..3b3ee45 100644
--- a/src/nvapi.cpp
+++ b/src/nvapi.cpp
@@ -181,12 +181,12 @@ extern "C" {
 
         *pNvDispHandle = reinterpret_cast<NvDisplayHandle>(output);
 
-        return Ok(str::format(n, " ", thisEnum));
+        return Ok(str::format(n, " (", thisEnum, ")"));
     }
 
     NvAPI_Status __cdecl NvAPI_EnumNvidiaUnAttachedDisplayHandle(NvU32 thisEnum, NvUnAttachedDisplayHandle *pNvUnAttachedDispHandle) {
         // DXVK does not know about unattached displays
-        return EndEnumeration(str::format(__func__, " ", thisEnum));
+        return EndEnumeration(str::format(__func__, " (", thisEnum, ")"));
     }
 
     NvAPI_Status __cdecl NvAPI_GetAssociatedNvidiaDisplayName(NvDisplayHandle NvDispHandle, NvAPI_ShortString szDisplayName) {
@@ -227,7 +227,7 @@ extern "C" {
         auto error = fromErrorNr(nr);
         strcpy(szDesc, error.c_str());
 
-        return Ok(str::format(n, " ", nr, " (", error, ")"));
+        return Ok(str::format(n, " (", nr, "/", error, ")"));
     }
 
     NvAPI_Status __cdecl NvAPI_Unload() {
diff --git a/src/nvapi_d3d11.cpp b/src/nvapi_d3d11.cpp
index 6c37ff6..49d2e4d 100644
--- a/src/nvapi_d3d11.cpp
+++ b/src/nvapi_d3d11.cpp
@@ -16,7 +16,7 @@ extern "C" {
         // DXVK does not know any NVIDIA intrinsics backdoors
         *supported = false;
 
-        return Ok(str::format(n, " ", code, " (", fromCode(code), ")"));
+        return Ok(str::format(n, " (", code, "/", fromCode(code), ")"));
     }
 
     NvAPI_Status __cdecl NvAPI_D3D11_SetDepthBoundsTest(IUnknown *pDeviceOrContext, NvU32 bEnable, float fMinDepth, float fMaxDepth) {
diff --git a/src/nvapi_d3d12.cpp b/src/nvapi_d3d12.cpp
index adf59d4..bcc269b 100644
--- a/src/nvapi_d3d12.cpp
+++ b/src/nvapi_d3d12.cpp
@@ -18,7 +18,7 @@ extern "C" {
         // VKD3D does not know any NVIDIA intrinsics
         *pSupported = false;
 
-        return Ok(str::format(n, " ", opCode, " (", fromCode(opCode), ")"));
+        return Ok(str::format(n, " (", opCode, "/", fromCode(opCode), ")"));
     }
 
     NvAPI_Status __cdecl NvAPI_D3D12_CreateCubinComputeShaderWithName(ID3D12Device* pDevice, const void* cubinData, NvU32 cubinSize, NvU32 blockX, NvU32 blockY, NvU32 blockZ, const char* shaderName, NVDX_ObjectHandle* pShader) {
@@ -214,9 +214,9 @@ extern "C" {
         extensionNames.pop_back();
 
         if (!NvapiD3d12Device::CreateGraphicsPipelineState(pDevice, pPSODesc, numExtensions, ppExtensions, ppPSO))
-            return NotSupported(str::format(n, " ", numExtensions, " (", extensionNames, ")"));
+            return NotSupported(str::format(n, " (", numExtensions, "/", extensionNames, ")"));
 
-        return Ok(str::format(n, " ", numExtensions, " (", extensionNames, ")"), alreadyLoggedOk);
+        return Ok(str::format(n, " (", numExtensions, "/", extensionNames, ")"), alreadyLoggedOk);
     }
 
     NvAPI_Status __cdecl NvAPI_D3D12_SetDepthBoundsTestValues(ID3D12GraphicsCommandList *pCommandList, const float minDepth, const float maxDepth) {
diff --git a/src/nvapi_disp.cpp b/src/nvapi_disp.cpp
index 4864d34..6f682bf 100644
--- a/src/nvapi_disp.cpp
+++ b/src/nvapi_disp.cpp
@@ -41,7 +41,7 @@ extern "C" {
                 return IncompatibleStructVersion(n);
         }
 
-        return Ok(str::format(n, " ", displayId));
+        return Ok(str::format(n, " (", displayId, ")"));
     }
 
     NvAPI_Status __cdecl NvAPI_DISP_GetDisplayIdByDisplayName(const char *displayName, NvU32 *displayId) {
@@ -55,11 +55,11 @@ extern "C" {
 
         auto id = nvapiAdapterRegistry->GetOutputId(std::string(displayName));
         if (id == -1)
-            return InvalidArgument(str::format(n, " ", displayName));
+            return InvalidArgument(str::format(n, " (", displayName, ")"));
 
         *displayId = id;
 
-        return Ok(str::format(n, " ", displayName));
+        return Ok(str::format(n, " (", displayName, ")"));
     }
 
     NvAPI_Status __cdecl NvAPI_DISP_GetGDIPrimaryDisplayId(NvU32 *displayId) {