From 28c0458099f747478fb9cf8543ccbb8bde8ea6c7 Mon Sep 17 00:00:00 2001
From: FakeMichau <49685661+FakeMichau@users.noreply.github.com>
Date: Wed, 13 Dec 2023 19:52:00 +0100
Subject: [PATCH] Reduce code repetition

---
 OptiScaler/nvapi/fakenvapi/nvapi.cpp | 114 ++++++++-------------------
 OptiScaler/nvapi/fakenvapi/nvapi.h   |  25 ++++++
 2 files changed, 60 insertions(+), 79 deletions(-)
 create mode 100644 OptiScaler/nvapi/fakenvapi/nvapi.h

diff --git a/OptiScaler/nvapi/fakenvapi/nvapi.cpp b/OptiScaler/nvapi/fakenvapi/nvapi.cpp
index 34f33087..a12a1fb4 100644
--- a/OptiScaler/nvapi/fakenvapi/nvapi.cpp
+++ b/OptiScaler/nvapi/fakenvapi/nvapi.cpp
@@ -1,29 +1,38 @@
-#include <algorithm>
-#include <unordered_map>
-#include <format>
-
-#include <dxgi.h>
-#include "../include/d3d12.h"
-#include <vector>
-
-#include "util.h"
-#include "spoofInfo.h"
-#include "log.h"
-
-static auto drs = 1U;
-static auto drsSession = reinterpret_cast<NvDRSSessionHandle>(&drs);
-static auto drsProfile = reinterpret_cast<NvDRSProfileHandle>(&drs);
-
-class Adapter {
-public:
-    LUID luid; // unused
-};
-
-Adapter* dummy{};
+#include "nvapi.h"
 
 namespace nvd {
     extern "C" {
         NvAPI_Status __cdecl NvAPI_Initialize() {
+            IDXGIFactory1* pFactory = nullptr;
+            if (FAILED(CreateDXGIFactory1(__uuidof(IDXGIFactory1), (void**)&pFactory))) {
+                log("Failed to create DXGI Factory");
+                return Error();
+            }
+
+            IDXGIAdapter1* pAdapter = nullptr;
+            if (FAILED(pFactory->EnumAdapters1(0, &pAdapter))) {
+                log("Failed to enumerate adapters");
+                pFactory->Release();
+                return Error();
+            }
+
+            DXGI_ADAPTER_DESC1 adapterDesc;
+            if (FAILED(pAdapter->GetDesc1(&adapterDesc))) {
+                log("Failed to get adapter description");
+                pAdapter->Release();
+                pFactory->Release();
+                return Error();
+            }
+
+            luid = adapterDesc.AdapterLuid;
+            deviceId = adapterDesc.DeviceId;
+            vendorId = adapterDesc.VendorId;
+            subSysId = adapterDesc.SubSysId;
+            revisionId = adapterDesc.Revision;
+
+            pAdapter->Release();
+            pFactory->Release();
+
             return Ok();
         }
 
@@ -76,33 +85,6 @@ namespace nvd {
         }
 
         NvAPI_Status __cdecl NvAPI_GPU_GetLogicalGpuInfo(NvLogicalGpuHandle logicalHandle, NV_LOGICAL_GPU_DATA* logicalGpuData) {
-            // Get the GPU adapter LUID using DXGI
-            IDXGIFactory1* pFactory = nullptr;
-            if (FAILED(CreateDXGIFactory1(__uuidof(IDXGIFactory1), (void**)&pFactory))) {
-                log("Failed to create DXGI Factory");
-                return Error();
-            }
-
-            IDXGIAdapter1* pAdapter = nullptr;
-            if (FAILED(pFactory->EnumAdapters1(0, &pAdapter))) {
-                log("Failed to enumerate adapters");
-                pFactory->Release();
-                return Error();
-            }
-
-            DXGI_ADAPTER_DESC1 adapterDesc;
-            if (FAILED(pAdapter->GetDesc1(&adapterDesc))) {
-                log("Failed to get adapter description");
-                pAdapter->Release();
-                pFactory->Release();
-                return Error();
-            }
-
-            auto luid = adapterDesc.AdapterLuid;
-
-            pAdapter->Release();
-            pFactory->Release();
-
             memcpy(logicalGpuData->pOSAdapterId, &luid, sizeof(luid));
             logicalGpuData->physicalGpuHandles[0] = reinterpret_cast<NvPhysicalGpuHandle>(dummy);
             logicalGpuData->physicalGpuCount = 1;
@@ -110,36 +92,10 @@ namespace nvd {
         }
 
         NvAPI_Status __cdecl NvAPI_GPU_GetPCIIdentifiers(NvPhysicalGpuHandle hPhysicalGpu, NvU32* pDeviceId, NvU32* pSubSystemId, NvU32* pRevisionId, NvU32* pExtDeviceId) {
-            // Get the GPU adapter LUID using DXGI
-            IDXGIFactory1* pFactory = nullptr;
-            if (FAILED(CreateDXGIFactory1(__uuidof(IDXGIFactory1), (void**)&pFactory))) {
-                log("Failed to create DXGI Factory");
-                return Error();
-            }
-
-            IDXGIAdapter1* pAdapter = nullptr;
-            if (FAILED(pFactory->EnumAdapters1(0, &pAdapter))) {
-                log("Failed to enumerate adapters");
-                pFactory->Release();
-                return Error();
-            }
-
-            DXGI_ADAPTER_DESC1 adapterDesc;
-            if (FAILED(pAdapter->GetDesc1(&adapterDesc))) {
-                log("Failed to get adapter description");
-                pAdapter->Release();
-                pFactory->Release();
-                return Error();
-            }
-
-            *pDeviceId = (adapterDesc.DeviceId << 16) | adapterDesc.VendorId;
-            *pSubSystemId = adapterDesc.SubSysId;
-            *pRevisionId = adapterDesc.Revision;
-            *pExtDeviceId = adapterDesc.DeviceId;
-
-            pAdapter->Release();
-            pFactory->Release();
-
+            *pDeviceId = (deviceId << 16) | vendorId;
+            *pSubSystemId = subSysId;
+            *pRevisionId = revisionId;
+            *pExtDeviceId = deviceId;
             return Ok();
         }
         NvAPI_Status __cdecl NvAPI_GPU_GetFullName(NvPhysicalGpuHandle hPhysicalGpu, NvAPI_ShortString szName) {
diff --git a/OptiScaler/nvapi/fakenvapi/nvapi.h b/OptiScaler/nvapi/fakenvapi/nvapi.h
new file mode 100644
index 00000000..a023aa28
--- /dev/null
+++ b/OptiScaler/nvapi/fakenvapi/nvapi.h
@@ -0,0 +1,25 @@
+#include <algorithm>
+#include <unordered_map>
+#include <format>
+
+#include <dxgi.h>
+#include "../include/d3d12.h"
+#include <vector>
+
+#include "util.h"
+#include "spoofInfo.h"
+#include "log.h"
+
+static auto drs = 1U;
+static auto drsSession = reinterpret_cast<NvDRSSessionHandle>(&drs);
+static auto drsProfile = reinterpret_cast<NvDRSProfileHandle>(&drs);
+
+
+static LUID luid;
+static UINT deviceId;
+static UINT vendorId;
+static UINT subSysId;
+static UINT revisionId;
+
+class Adapter {};
+Adapter* dummy{};
\ No newline at end of file