nvapi: Move resource-factory

jp7677 · Nov 9, 2024 · e2a2ac9 · e2a2ac9
1 parent b1a0a6a
commit e2a2ac9
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/src/meson.build b/src/meson.build
@@ -2,6 +2,7 @@ nvapi_src = files([
   'util/util_string.cpp',
   'util/util_env.cpp',
   'util/util_log.cpp',
+  'nvapi/resource_factory.cpp',
   'nvapi/lfx.cpp',
   'nvapi/nvapi_d3d_instance.cpp',
   'nvapi/nvapi_d3d_low_latency_device.cpp',
@@ -12,7 +13,6 @@ nvapi_src = files([
   'nvapi/nvapi_output.cpp',
   'nvapi/vulkan.cpp',
   'nvapi/nvml.cpp',
-  'resource_factory.cpp',
   'nvapi_globals.cpp',
   'nvapi.cpp',
   'nvapi_d3d.cpp',

diff --git a/src/nvapi/nvapi_adapter_registry.h b/src/nvapi/nvapi_adapter_registry.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../nvapi_private.h"
-#include "../resource_factory.h"
+#include "resource_factory.h"
 #include "nvapi_adapter.h"
 #include "nvapi_output.h"
 #include "vulkan.h"

diff --git a/src/nvapi/nvapi_d3d_instance.h b/src/nvapi/nvapi_d3d_instance.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../nvapi_private.h"
-#include "../resource_factory.h"
+#include "resource_factory.h"
 
 namespace dxvk {
     class NvapiD3dInstance {

diff --git a/src/resource_factory.cpp → src/nvapi/resource_factory.cpp b/src/resource_factory.cpp → src/nvapi/resource_factory.cpp
@@ -1,7 +1,7 @@
 #include "resource_factory.h"
-#include "interfaces/dxvk_interfaces.h"
-#include "util/util_string.h"
-#include "util/util_log.h"
+#include "../interfaces/dxvk_interfaces.h"
+#include "../util/util_string.h"
+#include "../util/util_log.h"
 
 namespace dxvk {
     ResourceFactory::ResourceFactory() = default;

diff --git a/src/resource_factory.h → src/nvapi/resource_factory.h b/src/resource_factory.h → src/nvapi/resource_factory.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "nvapi_private.h"
-#include "util/com_pointer.h"
-#include "nvapi/vulkan.h"
-#include "nvapi/nvml.h"
-#include "nvapi/lfx.h"
+#include "../nvapi_private.h"
+#include "../util/com_pointer.h"
+#include "vulkan.h"
+#include "nvml.h"
+#include "lfx.h"
 
 namespace dxvk {
     class ResourceFactory {

diff --git a/src/nvapi_globals.h b/src/nvapi_globals.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "nvapi_private.h"
-#include "resource_factory.h"
+#include "nvapi/resource_factory.h"
 #include "nvapi/nvapi_adapter_registry.h"
 #include "nvapi/nvapi_d3d_instance.h"
 

diff --git a/tests/meson.build b/tests/meson.build
@@ -2,6 +2,7 @@ nvapi_src = files([
   '../src/util/util_string.cpp',
   '../src/util/util_env.cpp',
   '../src/util/util_log.cpp',
+    '../src/nvapi/resource_factory.cpp',
   '../src/nvapi/vulkan.cpp',
   '../src/nvapi/nvml.cpp',
   '../src/nvapi/lfx.cpp',
@@ -10,7 +11,6 @@ nvapi_src = files([
   '../src/nvapi/nvapi_output.cpp',
   '../src/nvapi/nvapi_adapter.cpp',
   '../src/nvapi/nvapi_adapter_registry.cpp',
-  '../src/resource_factory.cpp',
   '../src/nvapi/nvapi_d3d11_device.cpp',
   '../src/nvapi/nvapi_d3d12_device.cpp',
   '../src/nvapi_globals.cpp',

diff --git a/tests/mock_factory.h b/tests/mock_factory.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "nvapi_tests_private.h"
-#include "../src/resource_factory.h"
+#include "../src/nvapi/resource_factory.h"
 
 using namespace trompeloeil;