Improve include madness.

Hopefully...
jp7677 · Feb 6, 2021 · 9e9c598 · 9e9c598
1 parent f003aff
commit 9e9c598
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 5 deletions.
diff --git a/src/nvapi.cpp b/src/nvapi.cpp
@@ -1,10 +1,8 @@
 #include "nvapi_private.h"
-#include "sysinfo/nvapi_adapter_registry.h"
-#include "d3d11/nvapi_d3d11_device.h"
+#include "nvapi_static.h"
 #include "util/util_statuscode.h"
 #include "util/util_string.h"
 #include "util/util_error.h"
-#include "util/util_op_code.h"
 #include "../version.h"
 
 #ifdef __GNUC__
@@ -14,8 +12,6 @@
 extern "C" {
     using namespace dxvk;
 
-    static NvapiAdapterRegistry* nvapiAdapterRegistry = nullptr;
-
     NvAPI_Status __cdecl NvAPI_EnumLogicalGPUs(NvLogicalGpuHandle nvGPUHandle[NVAPI_MAX_LOGICAL_GPUS], NvU32 *pGpuCount) {
         constexpr auto n = "NvAPI_EnumLogicalGPUs";
 

diff --git a/src/nvapi_d3d.cpp b/src/nvapi_d3d.cpp
@@ -1,3 +1,6 @@
+#include "nvapi_private.h"
+#include "util/util_statuscode.h"
+
 extern "C" {
     using namespace dxvk;
 

diff --git a/src/nvapi_d3d11.cpp b/src/nvapi_d3d11.cpp
@@ -1,3 +1,9 @@
+#include "nvapi_private.h"
+#include "d3d11/nvapi_d3d11_device.h"
+#include "util/util_statuscode.h"
+#include "util/util_string.h"
+#include "util/util_op_code.h"
+
 extern "C" {
     using namespace dxvk;
 

diff --git a/src/nvapi_disp.cpp b/src/nvapi_disp.cpp
@@ -1,3 +1,8 @@
+#include "nvapi_private.h"
+#include "nvapi_static.h"
+#include "util/util_statuscode.h"
+#include "util/util_string.h"
+
 extern "C" {
     using namespace dxvk;
 

diff --git a/src/nvapi_gpu.cpp b/src/nvapi_gpu.cpp
@@ -1,3 +1,7 @@
+#include "nvapi_private.h"
+#include "nvapi_static.h"
+#include "util/util_statuscode.h"
+
 extern "C" {
     using namespace dxvk;
 

diff --git a/src/nvapi_mosaic.cpp b/src/nvapi_mosaic.cpp
@@ -1,3 +1,6 @@
+#include "nvapi_private.h"
+#include "util/util_statuscode.h"
+
 extern "C" {
     using namespace dxvk;
 

diff --git a/src/nvapi_static.h b/src/nvapi_static.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "sysinfo/nvapi_adapter_registry.h"
+
+static dxvk::NvapiAdapterRegistry* nvapiAdapterRegistry = nullptr;
diff --git a/src/nvapi_sys.cpp b/src/nvapi_sys.cpp
@@ -1,3 +1,8 @@
+#include "nvapi_private.h"
+#include "nvapi_static.h"
+#include "util/util_statuscode.h"
+#include "../version.h"
+
 extern "C" {
     using namespace dxvk;